commit 57ddc155fcdb5a419860dd4a6ed03deabcc162f2 · pyrox.dev/nixpkgs

+1 -1

lib/licenses.nix

···

       188
       188
        
       

     

       189
       189
        
         fdl13 = spdx {

     

       190
       190
        
           spdxId = "GFDL-1.3";

     

       191
       191
       -
           fullName = "GNU Free Documentation License v1.2";

     

       191
       191
       +
           fullName = "GNU Free Documentation License v1.3";

     

       192
       192
        
         };

     

       193
       193
        
       

     

       194
       194
        
         free = {

+2 -3

nixos/modules/services/databases/redis.nix

···

       234
       234
        
               serviceConfig.Type = "oneshot";

     

       235
       235
        
       

     

       236
       236
        
               script = ''

     

       237
       237
       -
                 if ! test -e ${cfg.dbpath}; then

     

       238
       238
       -
                     install -d -m0700 -o ${cfg.user} ${cfg.dbpath}

     

       239
       239
       -
                 fi

     

       237
       237
       +
                 install -d -m0700 -o ${cfg.user} ${cfg.dbpath}

     

       238
       238
       +
                 chown -R ${cfg.user} ${cfg.dbpath}

     

       240
       239
        
               '';

     

       241
       240
        
             };

     

       242
       241

nixos/modules/virtualisation/virtualbox-image.nix

···

       57
       57
        
                 fn="$out/nixos-${config.system.nixosLabel}-${pkgs.stdenv.system}.ova"

     

       58
       58
        
                 VBoxManage export "$vmName" --output "$fn"

     

       59
       59
        
       

     

       60
       60
       +
                 rm -v $diskImage

     

       61
       61
       +
       

     

       60
       62
        
                 mkdir -p $out/nix-support

     

       61
       63
        
                 echo "file ova $fn" >> $out/nix-support/hydra-build-products

     

       62
       64
        
               '';

+2 -2

pkgs/applications/science/math/qalculate-gtk/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "qalculate-gtk-${version}";

     

       5
       5
       -
         version = "0.9.8";

     

       5
       5
       +
         version = "0.9.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";

     

       9
       9
       -
           sha256 = "15ci0p7jlikk2rira6ykgrmcdvgpxzprpqmkdxx6hsg4pvzrj54s";

     

       9
       9
       +
           sha256 = "0v9ibycilygmi9zzi7cxif7si56c85lfzdvbqnbf32whg8ydqqkg";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         hardeningDisable = [ "format" ];

+8 -11

pkgs/desktops/gnome-3/3.20/misc/gitg/default.nix

···

       1
       1
        
       { stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib

     

       2
       2
       -
       , json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection

     

       3
       3
       -
       , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret }:

     

       2
       2
       +
       , json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection

     

       3
       3
       +
       , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret

     

       4
       4
       +
       , dconf}:

     

       5
       5
       +
       

     

       4
       6
        
       

     

       5
       7
        
       # TODO: icons and theme still does not work

     

       6
       8
        
       # use packaged gnome3.adwaita-icon-theme 

     
···

       20
       22
        
       

     

       21
       23
        
         buildInputs = [ vala_0_32 intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas

     

       22
       24
        
                         libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview

     

       23
       23
       -
                         librsvg libsecret

     

       24
       24
       -
                         gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ];

     

       25
       25
       +
                         librsvg libsecret dconf

     

       26
       26
       +
                         gobjectIntrospection gnome3.adwaita-icon-theme ];

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [ wrapGAppsHook ];

     

       25
       29
        
       

     

       26
       30
        
         # https://bugzilla.gnome.org/show_bug.cgi?id=758240

     

       27
       31
        
         preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir'';

     

       28
       28
       -
       

     

       29
       29
       -
         preFixup = ''

     

       30
       30
       -
           wrapProgram "$out/bin/gitg" \

     

       31
       31
       -
             --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \

     

       32
       32
       -
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       33
       33
       -
             --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"

     

       34
       34
       -
         '';

     

       35
       32
        
       

     

       36
       33
        
         meta = with stdenv.lib; {

     

       37
       34
        
           homepage = https://wiki.gnome.org/action/show/Apps/Gitg;

+3 -4

pkgs/development/haskell-modules/hackage-packages.nix

···

       171679
       171679
        
       

     

       171680
       171680
        
         "unbound" = callPackage

     

       171681
       171681
        
           ({ mkDerivation, base, binary, containers, mtl, parsec, pretty

     

       171682
       171682
       -
            , QuickCheck, RepLib, template-haskell, transformers

     

       171682
       171682
       +
            , QuickCheck, RepLib, stdenv, template-haskell, transformers

     

       171683
       171683
        
            }:

     

       171684
       171684
        
            mkDerivation {

     

       171685
       171685
        
              pname = "unbound";

     

       171686
       171686
       -
              version = "0.5.0";

     

       171687
       171687
       -
              sha256 = "1290827b7a67d87eaa4dfa8d753e01d98ef0d501ee42da0f9635fdd73b64220e";

     

       171686
       171686
       +
              version = "0.5.1";

     

       171687
       171687
       +
              sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12";

     

       171688
       171688
        
              libraryHaskellDepends = [

     

       171689
       171689
        
                base binary containers mtl RepLib transformers

     

       171690
       171690
        
              ];

     
···

       171695
       171695
        
              homepage = "https://github.com/sweirich/replib";

     

       171696
       171696
        
              description = "Generic support for programming with names and binders";

     

       171697
       171697
        
              license = stdenv.lib.licenses.bsd3;

     

       171698
       171698
       -
              hydraPlatforms = [ "x86_64-darwin" ];

     

       171699
       171698
        
            }) {};

     

       171700
       171699
        
       

     

       171701
       171700
        
         "unbound-generics" = callPackage

+2 -2

pkgs/development/libraries/libqalculate/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "libqalculate-${version}";

     

       5
       5
       -
         version = "0.9.8";

     

       5
       5
       +
         version = "0.9.9";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";

     

       9
       9
       -
           sha256 = "07rd95a0wsqs3iymr64mlljn191f8gdnjvr9d4l1spjv3s8j5wdi";

     

       9
       9
       +
           sha256 = "0avri5c3sr31ax0vjvzla1a11xb4irnrc6571lm6w4zxigqakkqk";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ];

+29 -93

pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch

···

       1
       1
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       1
       1
       +
       Index: qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       2
       2
        
       ===================================================================

     

       3
       3
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       4
       4
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       3
       3
       +
       --- qtbase-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       4
       4
       +
       +++ qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       5
       5
        
       @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)

     

       6
       6
        
        endif()

     

       7
       7
        
        !!ENDIF

     
···

       173
       173
        
            endif()

     

       174
       174
        
        !!ENDIF // CMAKE_RELEASE_TYPE

     

       175
       175
        
        !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD

     

       176
       176
       -
       @@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       177
       177
       -
            macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)

     

       176
       176
       +
       @@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       178
       177
        
                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       179
       178
        
        

     

       180
       180
       -
       -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       179
       179
       +
        !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       181
       180
        
       -        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       -
       -!!ELSE

     

       183
       183
       -
       -        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       -
       -!!ENDIF

     

       185
       185
       -
       +        set(imported_location \"${PLUGIN_LOCATION}\")

     

       186
       186
       -
                _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})

     

       187
       187
       -
                set_target_properties(Qt5::${Plugin} PROPERTIES

     

       188
       188
       -
                    \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}

     

       189
       189
       -
       Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       181
       181
       +
       +        set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       +
        !!ELSE

     

       183
       183
       +
                set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       +
        !!ENDIF

     

       185
       185
       +
       Index: qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in

     

       190
       186
        
       ===================================================================

     

       191
       191
       -
       --- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in

     

       192
       192
       -
       +++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       187
       187
       +
       --- qtbase-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in

     

       188
       188
       +
       +++ qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in

     

       193
       189
        
       @@ -2,7 +2,7 @@

     

       194
       190
        
        !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)

     

       195
       191
        
        

     
···

       215
       211
        
        !!ELSE

     

       216
       212
        
            set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       217
       213
        
        !!ENDIF

     

       218
       218
       -
       Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       214
       214
       +
       Index: qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       219
       215
        
       ===================================================================

     

       220
       220
       -
       --- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       221
       221
       -
       +++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       216
       216
       +
       --- qtbase-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       217
       217
       +
       +++ qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       222
       218
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)

     

       223
       219
        
            add_executable(Qt5::uic IMPORTED)

     

       224
       220
        
        

     
···

       228
       224
        
        !!ELSE

     

       229
       225
        
            set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")

     

       230
       226
        
        !!ENDIF

     

       231
       231
       -
       Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       227
       227
       +
       Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       232
       228
        
       ===================================================================

     

       233
       233
       -
       --- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       234
       234
       -
       +++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       229
       229
       +
       --- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       230
       230
       +
       +++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       235
       231
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)

     

       236
       232
        
            add_executable(Qt5::qmake IMPORTED)

     

       237
       233
        
        

     
···

       259
       255
        
        !!ELSE

     

       260
       256
        
            set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")

     

       261
       257
        
        !!ENDIF

     

       262
       262
       -
       @@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain)

     

       258
       258
       +
       @@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)

     

       263
       259
        
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       264
       260
        
            set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

     

       265
       261
        
        !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     
···

       268
       264
        
        !!ELSE

     

       269
       265
        
            set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")

     

       270
       266
        
        !!ENDIF

     

       271
       271
       -
       @@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain)

     

       267
       267
       +
       @@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)

     

       272
       268
        
            set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)

     

       273
       269
        
        

     

       274
       270
        
        !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     
···

       277
       273
        
        !!ELSE

     

       278
       274
        
            set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")

     

       279
       275
        
        !!ENDIF

     

       280
       280
       -
       Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       276
       276
       +
       Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       281
       277
        
       ===================================================================

     

       282
       282
       -
       --- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       283
       283
       -
       +++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       278
       278
       +
       --- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       279
       279
       +
       +++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       284
       280
        
       @@ -1,6 +1,6 @@

     

       285
       281
        
        

     

       286
       282
        
        !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)

     
···

       289
       285
        
        !!ELSE

     

       290
       286
        
        set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       291
       287
        
        !!ENDIF

     

       292
       292
       -
       Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       288
       288
       +
       Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       293
       289
        
       ===================================================================

     

       294
       294
       -
       --- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       295
       295
       -
       +++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       290
       290
       +
       --- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       291
       291
       +
       +++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       296
       292
        
       @@ -1,6 +1,6 @@

     

       297
       293
        
        

     

       298
       294
        
        !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)

     
···

       301
       297
        
        !!ELSE

     

       302
       298
        
        set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       303
       299
        
        !!ENDIF

     

       304
       304
       -
       Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       300
       300
       +
       Index: qtbase-opensource-src-5.6.0/src/qtbase/dbus/Qt5DBusConfigExtras.cmake.in

     

       305
       301
        
       ===================================================================

     

       306
       306
       -
       --- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       307
       307
       -
       +++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       302
       302
       +
       --- qtbase-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       303
       303
       +
       +++ qtbase-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       308
       304
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)

     

       309
       305
        
            add_executable(Qt5::qdbuscpp2xml IMPORTED)

     

       310
       306
        
        

     
···

       323
       319
        
        !!ELSE

     

       324
       320
        
            set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       325
       321
        
        !!ENDIF

     

       326
       326
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       327
       327
       -
       ===================================================================

     

       328
       328
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf

     

       329
       329
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       330
       330
       -
       @@ -136,28 +136,28 @@ contains(CONFIG, plugin) {

     

       331
       331
       -
        

     

       332
       332
       -
            win32 {

     

       333
       333
       -
                isEmpty(CMAKE_STATIC_TYPE) {

     

       334
       334
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll

     

       335
       335
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll

     

       336
       336
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll

     

       337
       337
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll

     

       338
       338
       -
                } else:mingw {

     

       339
       339
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a

     

       340
       340
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a

     

       341
       341
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a

     

       342
       342
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a

     

       343
       343
       -
                } else {                         # MSVC static

     

       344
       344
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib

     

       345
       345
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib

     

       346
       346
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib

     

       347
       347
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib

     

       348
       348
       -
                }

     

       349
       349
       -
            } else {

     

       350
       350
       -
                mac {

     

       351
       351
       -
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib

     

       352
       352
       -
                    else: CMAKE_PlUGIN_EXT = .a

     

       353
       353
       -
        

     

       354
       354
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       355
       355
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       356
       356
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       357
       357
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       358
       358
       -
                } else {

     

       359
       359
       -
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so

     

       360
       360
       -
                    else: CMAKE_PlUGIN_EXT = .a

     

       361
       361
       -
        

     

       362
       362
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       363
       363
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       364
       364
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       365
       365
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       366
       366
       -
                }

     

       367
       367
       -
            }

     

       368
       368
       -
            cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in

     

       369
       369
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       370
       370
       -
       ===================================================================

     

       371
       371
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       372
       372
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       373
       373
       -
       @@ -2,10 +2,10 @@

     

       374
       374
       -
        add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)

     

       375
       375
       -
        

     

       376
       376
       -
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       377
       377
       -
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       378
       378
       -
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       379
       379
       -
        !!ENDIF

     

       380
       380
       -
        !!IF !isEmpty(CMAKE_DEBUG_TYPE)

     

       381
       381
       -
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       382
       382
       -
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       383
       383
       -
        !!ENDIF

     

       384
       384
       -
        

     

       385
       385
       -
        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)

+29 -93

pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch

···

       1
       1
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       1
       1
       +
       Index: qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       2
       2
        
       ===================================================================

     

       3
       3
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       4
       4
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       3
       3
       +
       --- qtbase-opensource-src-5.6.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       4
       4
       +
       +++ qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

     

       5
       5
        
       @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)

     

       6
       6
        
        endif()

     

       7
       7
        
        !!ENDIF

     
···

       173
       173
        
            endif()

     

       174
       174
        
        !!ENDIF // CMAKE_RELEASE_TYPE

     

       175
       175
        
        !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD

     

       176
       176
       -
       @@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       177
       177
       -
            macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)

     

       176
       176
       +
       @@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       178
       177
        
                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       179
       178
        
        

     

       180
       180
       -
       -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       179
       179
       +
        !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       181
       180
        
       -        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       -
       -!!ELSE

     

       183
       183
       -
       -        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       -
       -!!ENDIF

     

       185
       185
       -
       +        set(imported_location \"${PLUGIN_LOCATION}\")

     

       186
       186
       -
                _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})

     

       187
       187
       -
                set_target_properties(Qt5::${Plugin} PROPERTIES

     

       188
       188
       -
                    \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}

     

       189
       189
       -
       Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       181
       181
       +
       +        set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       +
        !!ELSE

     

       183
       183
       +
                set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       +
        !!ENDIF

     

       185
       185
       +
       Index: qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       190
       186
        
       ===================================================================

     

       191
       191
       -
       --- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in

     

       192
       192
       -
       +++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       187
       187
       +
       --- qtbase-opensource-src-5.6.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in

     

       188
       188
       +
       +++ qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       193
       189
        
       @@ -2,7 +2,7 @@

     

       194
       190
        
        !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)

     

       195
       191
        
        

     
···

       215
       211
        
        !!ELSE

     

       216
       212
        
            set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")

     

       217
       213
        
        !!ENDIF

     

       218
       218
       -
       Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       214
       214
       +
       Index: qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       219
       215
        
       ===================================================================

     

       220
       220
       -
       --- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       221
       221
       -
       +++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       216
       216
       +
       --- qtbase-opensource-src-5.6.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       217
       217
       +
       +++ qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in

     

       222
       218
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)

     

       223
       219
        
            add_executable(Qt5::uic IMPORTED)

     

       224
       220
        
        

     
···

       228
       224
        
        !!ELSE

     

       229
       225
        
            set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")

     

       230
       226
        
        !!ENDIF

     

       231
       231
       -
       Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       227
       227
       +
       Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       232
       228
        
       ===================================================================

     

       233
       233
       -
       --- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       234
       234
       -
       +++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       229
       229
       +
       --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       230
       230
       +
       +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in

     

       235
       231
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)

     

       236
       232
        
            add_executable(Qt5::qmake IMPORTED)

     

       237
       233
        
        

     
···

       259
       255
        
        !!ELSE

     

       260
       256
        
            set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\")

     

       261
       257
        
        !!ENDIF

     

       262
       262
       -
       @@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain)

     

       258
       258
       +
       @@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain)

     

       263
       259
        
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       264
       260
        
            set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)

     

       265
       261
        
        !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     
···

       268
       264
        
        !!ELSE

     

       269
       265
        
            set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\")

     

       270
       266
        
        !!ENDIF

     

       271
       271
       -
       @@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain)

     

       267
       267
       +
       @@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain)

     

       272
       268
        
            set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)

     

       273
       269
        
        

     

       274
       270
        
        !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)

     
···

       277
       273
        
        !!ELSE

     

       278
       274
        
            set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")

     

       279
       275
        
        !!ENDIF

     

       280
       280
       -
       Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       276
       276
       +
       Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       281
       277
        
       ===================================================================

     

       282
       282
       -
       --- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       283
       283
       -
       +++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       278
       278
       +
       --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       279
       279
       +
       +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in

     

       284
       280
        
       @@ -1,6 +1,6 @@

     

       285
       281
        
        

     

       286
       282
        
        !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)

     
···

       289
       285
        
        !!ELSE

     

       290
       286
        
        set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       291
       287
        
        !!ENDIF

     

       292
       292
       -
       Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       288
       288
       +
       Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       293
       289
        
       ===================================================================

     

       294
       294
       -
       --- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       295
       295
       -
       +++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       290
       290
       +
       --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       291
       291
       +
       +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in

     

       296
       292
        
       @@ -1,6 +1,6 @@

     

       297
       293
        
        

     

       298
       294
        
        !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)

     
···

       301
       297
        
        !!ELSE

     

       302
       298
        
        set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")

     

       303
       299
        
        !!ENDIF

     

       304
       304
       -
       Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       300
       300
       +
       Index: qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       305
       301
        
       ===================================================================

     

       306
       306
       -
       --- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       307
       307
       -
       +++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       302
       302
       +
       --- qtbase-opensource-src-5.6.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       303
       303
       +
       +++ qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in

     

       308
       304
        
       @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)

     

       309
       305
        
            add_executable(Qt5::qdbuscpp2xml IMPORTED)

     

       310
       306
        
        

     
···

       323
       319
        
        !!ELSE

     

       324
       320
        
            set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       325
       321
        
        !!ENDIF

     

       326
       326
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       327
       327
       -
       ===================================================================

     

       328
       328
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf

     

       329
       329
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       330
       330
       -
       @@ -136,28 +136,28 @@ contains(CONFIG, plugin) {

     

       331
       331
       -
        

     

       332
       332
       -
            win32 {

     

       333
       333
       -
                isEmpty(CMAKE_STATIC_TYPE) {

     

       334
       334
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll

     

       335
       335
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll

     

       336
       336
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll

     

       337
       337
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll

     

       338
       338
       -
                } else:mingw {

     

       339
       339
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a

     

       340
       340
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a

     

       341
       341
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a

     

       342
       342
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a

     

       343
       343
       -
                } else {                         # MSVC static

     

       344
       344
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib

     

       345
       345
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib

     

       346
       346
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib

     

       347
       347
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib

     

       348
       348
       -
                }

     

       349
       349
       -
            } else {

     

       350
       350
       -
                mac {

     

       351
       351
       -
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib

     

       352
       352
       -
                    else: CMAKE_PlUGIN_EXT = .a

     

       353
       353
       -
        

     

       354
       354
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       355
       355
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       356
       356
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       357
       357
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       358
       358
       -
                } else {

     

       359
       359
       -
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so

     

       360
       360
       -
                    else: CMAKE_PlUGIN_EXT = .a

     

       361
       361
       -
        

     

       362
       362
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       363
       363
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       364
       364
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       365
       365
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       366
       366
       -
                }

     

       367
       367
       -
            }

     

       368
       368
       -
            cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in

     

       369
       369
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       370
       370
       -
       ===================================================================

     

       371
       371
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       372
       372
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       373
       373
       -
       @@ -2,10 +2,10 @@

     

       374
       374
       -
        add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)

     

       375
       375
       -
        

     

       376
       376
       -
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       377
       377
       -
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       378
       378
       -
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       379
       379
       -
        !!ENDIF

     

       380
       380
       -
        !!IF !isEmpty(CMAKE_DEBUG_TYPE)

     

       381
       381
       -
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       382
       382
       -
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       383
       383
       -
        !!ENDIF

     

       384
       384
       -
        

     

       385
       385
       -
        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)

+6 -70

pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch

···

       173
       173
        
            endif()

     

       174
       174
        
        !!ENDIF // CMAKE_RELEASE_TYPE

     

       175
       175
        
        !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD

     

       176
       176
       -
       @@ -328,11 +258,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       177
       177
       -
            macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)

     

       176
       176
       +
       @@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME

     

       178
       177
        
                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})

     

       179
       178
        
        

     

       180
       180
       -
       -!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       179
       179
       +
        !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)

     

       181
       180
        
       -        set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       -
       -!!ELSE

     

       183
       183
       -
       -        set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       -
       -!!ENDIF

     

       185
       185
       -
       +        set(imported_location \"${PLUGIN_LOCATION}\")

     

       186
       186
       -
                _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})

     

       187
       187
       -
                set_target_properties(Qt5::${Plugin} PROPERTIES

     

       188
       188
       -
                    \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}

     

       181
       181
       +
       +        set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       182
       182
       +
        !!ELSE

     

       183
       183
       +
                set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")

     

       184
       184
       +
        !!ENDIF

     

       189
       185
        
       Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in

     

       190
       186
        
       ===================================================================

     

       191
       187
        
       --- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in

     
···

       323
       319
        
        !!ELSE

     

       324
       320
        
            set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\")

     

       325
       321
        
        !!ENDIF

     

       326
       326
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       327
       327
       -
       ===================================================================

     

       328
       328
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/create_cmake.prf

     

       329
       329
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/create_cmake.prf

     

       330
       330
       -
       @@ -136,28 +136,28 @@ contains(CONFIG, plugin) {

     

       331
       331
       -
        

     

       332
       332
       -
            win32 {

     

       333
       333
       -
                isEmpty(CMAKE_STATIC_TYPE) {

     

       334
       334
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.dll

     

       335
       335
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.dll

     

       336
       336
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.dll

     

       337
       337
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.dll

     

       338
       338
       -
                } else:mingw {

     

       339
       339
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}.a

     

       340
       340
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}d.a

     

       341
       341
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}/$$PLUGIN_TYPE/lib$${TARGET}.a

     

       342
       342
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}d.a

     

       343
       343
       -
                } else {                         # MSVC static

     

       344
       344
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${TARGET}.lib

     

       345
       345
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${TARGET}d.lib

     

       346
       346
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}.lib

     

       347
       347
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/$${TARGET}d.lib

     

       348
       348
       -
                }

     

       349
       349
       -
            } else {

     

       350
       350
       -
                mac {

     

       351
       351
       -
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib

     

       352
       352
       -
                    else: CMAKE_PlUGIN_EXT = .a

     

       353
       353
       -
        

     

       354
       354
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       355
       355
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       356
       356
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       357
       357
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       358
       358
       -
                } else {

     

       359
       359
       -
                    isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .so

     

       360
       360
       -
                    else: CMAKE_PlUGIN_EXT = .a

     

       361
       361
       -
        

     

       362
       362
       -
       -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       363
       363
       -
       -            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       364
       364
       -
       +            CMAKE_PLUGIN_LOCATION_RELEASE = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       365
       365
       -
       +            CMAKE_PLUGIN_LOCATION_DEBUG = $${CMAKE_PLUGIN_DIR}$$PLUGIN_TYPE/lib$${TARGET}$${CMAKE_PlUGIN_EXT}

     

       366
       366
       -
                }

     

       367
       367
       -
            }

     

       368
       368
       -
            cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in

     

       369
       369
       -
       Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       370
       370
       -
       ===================================================================

     

       371
       371
       -
       --- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       372
       372
       -
       +++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in

     

       373
       373
       -
       @@ -2,10 +2,10 @@

     

       374
       374
       -
        add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)

     

       375
       375
       -
        

     

       376
       376
       -
        !!IF !isEmpty(CMAKE_RELEASE_TYPE)

     

       377
       377
       -
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       378
       378
       -
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")

     

       379
       379
       -
        !!ENDIF

     

       380
       380
       -
        !!IF !isEmpty(CMAKE_DEBUG_TYPE)

     

       381
       381
       -
       -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       382
       382
       -
       +_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")

     

       383
       383
       -
        !!ENDIF

     

       384
       384
       -
        

     

       385
       385
       -
        list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)

+2 -2

pkgs/development/python-modules/h5py/default.nix

···

       12
       12
        
       

     

       13
       13
        
       in buildPythonPackage rec {

     

       14
       14
        
         name = "h5py-${version}";

     

       15
       15
       -
         version = "2.5.0";

     

       15
       15
       +
         version = "2.6.0";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchurl {

     

       18
       18
        
           url = "mirror://pypi/h/h5py/${name}.tar.gz";

     

       19
       19
       -
           sha256 = "9833df8a679e108b561670b245bcf9f3a827b10ccb3a5fa1341523852cfac2f6";

     

       19
       19
       +
           sha256 = "0df46dg7i7xfking9lp221bfm8dbl974yvlrbi1w7r6m61ac7bxj";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";

+2 -2

pkgs/games/cuyo/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, SDL, SDL_mixer }:

     

       1
       1
       +
       { stdenv, fetchurl, SDL, SDL_mixer, zlib }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "cuyo-${version}";

     
···

       9
       9
        
            sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c";

     

       10
       10
        
            };

     

       11
       11
        
       

     

       12
       12
       -
        buildInputs = [ SDL SDL_mixer];

     

       12
       12
       +
         buildInputs = [ SDL SDL_mixer zlib ];

     

       13
       13
        
            

     

       14
       14
        
         meta = {

     

       15
       15
        
            homepage = http://karimmi.de/cuyo;

+2 -2

pkgs/games/kobodeluxe/default.nix

···

       1
       1
       -
       {stdenv, fetchurl, SDL, SDL_image} :

     

       1
       1
       +
       {stdenv, fetchurl, SDL, SDL_image, mesa} :

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "kobodeluxe-0.5.1";

     
···

       7
       7
        
           sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c";

     

       8
       8
        
         };

     

       9
       9
        
       

     

       10
       10
       -
         buildInputs = [ SDL SDL_image];

     

       10
       10
       +
         buildInputs = [ SDL SDL_image mesa ];

     

       11
       11
        
       

     

       12
       12
        
         prePatch = ''

     

       13
       13
        
           sed -e 's/char \*tok/const char \*tok/' -i graphics/window.cpp

+3 -3

pkgs/games/scummvm/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib }:

     

       1
       1
       +
       { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         name = "scummvm-1.8.0";

     
···

       7
       7
        
           url = "mirror://sourceforge/scummvm/${name}.tar.bz2";

     

       8
       8
        
           sha256 = "0f3zgvz886lk9ps0v333aq74vx6grlx68hg14gfaxcvj55g73v01";

     

       9
       9
        
         };

     

       10
       10
       -
       

     

       11
       11
       -
         buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ];

     

       10
       10
       +
         

     

       11
       11
       +
         buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib mesa ];

     

       12
       12
        
       

     

       13
       13
        
         hardeningDisable = [ "format" ];

     

       14
       14

+2 -2

pkgs/tools/backup/borg/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         name = "borgbackup-${version}";

     

       5
       5
       -
         version = "1.0.6";

     

       5
       5
       +
         version = "1.0.7";

     

       6
       6
        
         namePrefix = "";

     

       7
       7
        
       

     

       8
       8
        
         src = fetchurl {

     

       9
       9
        
           url = "https://github.com/borgbackup/borg/releases/download/"

     

       10
       10
        
             + "${version}/${name}.tar.gz";

     

       11
       11
       -
           sha256 = "1dxn9p4xm0zd32xzzd9hs4a542db34clykrrnnv3hrdnc394895p";

     

       11
       11
       +
           sha256 = "1l9iw55w5x51yxl3q89cf6avg80lajxvc8qz584hrsmnk6i56cr0";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = with python3Packages; [

+29

pkgs/tools/misc/blink1-tool/default.nix

···

       1
       1
       +
       { stdenv, fetchurl, libusb1, pkgconfig, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         name = "blink1-${version}";

     

       5
       5
       +
         version = "v1.98";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchurl {

     

       8
       8
       +
           url = "https://github.com/todbot/blink1/archive/${version}.tar.gz";

     

       9
       9
       +
           sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb";

     

       10
       10
       +
         };

     

       11
       11
       +
       

     

       12
       12
       +
         buildInputs = [ libusb1 pkgconfig ];

     

       13
       13
       +
       

     

       14
       14
       +
         configurePhase = ''

     

       15
       15
       +
           cd commandline

     

       16
       16
       +
         '';

     

       17
       17
       +
       

     

       18
       18
       +
         installPhase = ''

     

       19
       19
       +
           PREFIX=$out make install

     

       20
       20
       +
         '';

     

       21
       21
       +
       

     

       22
       22
       +
         meta = {

     

       23
       23
       +
           description = "Command line client for the blink(1) notification light";

     

       24
       24
       +
           homepage = https://blink1.thingm.com/;

     

       25
       25
       +
           license = stdenv.lib.licenses.cc-by-sa-30;

     

       26
       26
       +
           maintainers = [ stdenv.lib.maintainers.cransom ];

     

       27
       27
       +
           platforms = stdenv.lib.platforms.linux;

     

       28
       28
       +
         };

     

       29
       29
       +
       }

+4 -4

pkgs/tools/misc/hdf5/default.nix

···

       15
       15
        
       with { inherit (stdenv.lib) optional optionals; };

     

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
       -
         version = "1.8.16";

     

       18
       18
       +
         version = "1.10.0-patch1";

     

       19
       19
        
         name = "hdf5-${version}";

     

       20
       20
        
         src = fetchurl {

     

       21
       21
       -
           url = "http://www.hdfgroup.org/ftp/HDF5/releases/${name}/src/${name}.tar.bz2";

     

       22
       22
       -
           sha256 = "1ilq8pn9lxbf2wj2rdzwqabxismznjj1d23iw6g78w0bl5dsxahk";

     

       23
       23
       -
        };

     

       21
       21
       +
           url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${name}/src/${name}.tar.bz2";

     

       22
       22
       +
           sha256 = "1fnzdw0ay5mm9v2vjxfhpjkwrkf9ccfah62lhlcfpp2kv16jcwpp";

     

       23
       23
       +
         };

     

       24
       24
        
       

     

       25
       25
        
         passthru = {

     

       26
       26
        
           mpiSupport = (mpi != null);

pkgs/top-level/all-packages.nix

···

       598
       598
        
           gnutls = gnutls33;

     

       599
       599
        
         };

     

       600
       600
        
       

     

       601
       601
       +
         blink1-tool = callPackage ../tools/misc/blink1-tool { };

     

       602
       602
       +
       

     

       601
       603
        
         blitz = callPackage ../development/libraries/blitz { };

     

       602
       604
        
       

     

       603
       605
        
         blockdiag = pythonPackages.blockdiag;

+20 -12

pkgs/top-level/python-packages.nix

···

       18151
       18151
        
       

     

       18152
       18152
        
       

     

       18153
       18153
        
         vobject = buildPythonPackage rec {

     

       18154
       18154
       -
           version = "0.9.2";

     

       18154
       18154
       +
           version = "0.9.3";

     

       18155
       18155
        
           name = "vobject-${version}";

     

       18156
       18156
        
       

     

       18157
       18157
        
           src = pkgs.fetchFromGitHub {

     

       18158
       18158
        
             owner = "eventable";

     

       18159
       18159
        
             repo = "vobject";

     

       18160
       18160
       -
             sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g";

     

       18161
       18161
       -
             rev = "7f042fdc62c9e9dc29d5f81313b9747cde205670";

     

       18160
       18160
       +
             sha256 = "00vbii5awwqwfh5hfklj1q79w7d85gjigvf2imgyb71g03sb8cjv";

     

       18161
       18161
       +
             rev = version;

     

       18162
       18162
        
           };

     

       18163
       18163
        
       

     

       18164
       18164
        
           disabled = isPyPy;

     
···

       24049
       24049
        
         };

     

       24050
       24050
        
       

     

       24051
       24051
        
         twisted = buildPythonPackage rec {

     

       24052
       24052
       -
           disabled = isPy3k;

     

       24053
       24052
        
       

     

       24054
       24053
        
           name = "Twisted-${version}";

     

       24055
       24055
       -
           version = "16.2.0";

     

       24054
       24054
       +
           version = "16.4.0";

     

       24056
       24055
        
           src = pkgs.fetchurl {

     

       24057
       24056
        
             url = "mirror://pypi/T/Twisted/${name}.tar.bz2";

     

       24058
       24058
       -
             sha256 = "0ydxrp9myw1mvsz3qfzx5579y5llmqa82pxvqchgp5syczffi450";

     

       24057
       24057
       +
             sha256 = "cd8820901900542d21fb1dee2cd4d4d334fff130e3fc30b777f81dd7d7f2836e";

     

       24059
       24058
        
           };

     

       24060
       24059
        
       

     

       24061
       24060
        
           propagatedBuildInputs = with self; [ zope_interface ];

     

       24062
       24061
        
       

     

       24063
       24063
       -
           # Generate Twisted's plug-in cache.  Twited users must do it as well.  See

     

       24062
       24062
       +
           # Generate Twisted's plug-in cache.  Twisted users must do it as well.  See

     

       24064
       24063
        
           # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3

     

       24065
       24064
        
           # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for

     

       24066
       24065
        
           # details.

     

       24067
       24066
        
           postInstall = "$out/bin/twistd --help > /dev/null";

     

       24067
       24067
       +
       

     

       24068
       24068
       +
           checkPhase = ''

     

       24069
       24069
       +
             ${python.interpreter} -m unittest discover -s twisted/test

     

       24070
       24070
       +
           '';

     

       24071
       24071
       +
           # Tests require network

     

       24072
       24072
       +
           doCheck = false;

     

       24068
       24073
        
       

     

       24069
       24074
        
           meta = {

     

       24070
       24075
        
             homepage = http://twistedmatrix.com/;

     
···

       24897
       24902
        
         };

     

       24898
       24903
        
       

     

       24899
       24904
        
         xlib = buildPythonPackage (rec {

     

       24900
       24900
       -
           name = "xlib-0.15rc1";

     

       24905
       24905
       +
           name = "xlib-${version}";

     

       24906
       24906
       +
           version = "0.17";

     

       24901
       24907
        
       

     

       24902
       24902
       -
           src = pkgs.fetchurl {

     

       24903
       24903
       -
             url = "mirror://sourceforge/python-xlib/python-${name}.tar.bz2";

     

       24904
       24904
       -
             sha256 = "0mvzz605pxzj7lfp2w6z4qglmr4rjza9xrb7sl8yn12cklzfky0m";

     

       24908
       24908
       +
           src = pkgs.fetchFromGitHub {

     

       24909
       24909
       +
             owner = "python-xlib";

     

       24910
       24910
       +
             repo = "python-xlib";

     

       24911
       24911
       +
             rev = "${version}";

     

       24912
       24912
       +
             sha256 = "1iiz2nq2hq9x6laavngvfngnmxbgnwh54wdbq6ncx4va7v98liyi";

     

       24905
       24913
        
           };

     

       24906
       24914
        
       

     

       24907
       24915
        
           # Tests require `pyutil' so disable them to avoid circular references.

     

       24908
       24916
        
           doCheck = false;

     

       24909
       24917
        
       

     

       24910
       24910
       -
           propagatedBuildInputs = with self; [ pkgs.xorg.libX11 ];

     

       24918
       24918
       +
           propagatedBuildInputs = with self; [ six setuptools_scm pkgs.xorg.libX11 ];

     

       24911
       24919
        
       

     

       24912
       24920
        
           meta = {

     

       24913
       24921
        
             description = "Fully functional X client library for Python programs";