Author: urkud
Date: Tue Feb 22 09:53:01 2011
New Revision: 26053
URL: https://svn.nixos.org/websvn/nix/?rev=26053&sc=1
Log:
Move qca2 outside of kde-4.x
Added:
nixpkgs/trunk/pkgs/development/libraries/qca2/
nixpkgs/trunk/pkgs/development/libraries/qca2/default.nix
- copied, changed from r26052,
nixpkgs/trunk/pkgs/desktops/kde-4.6/support/qca2/default.nix
nixpkgs/trunk/pkgs/development/libraries/qca2/ossl.nix
- copied, changed from r26052,
nixpkgs/trunk/pkgs/desktops/kde-4.6/support/qca2/ossl.nix
Deleted:
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/qca2/
nixpkgs/trunk/pkgs/desktops/kde-4.6/support/qca2/
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Feb 22 09:52:54
2011 (r26052)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Feb 22 09:53:01
2011 (r26053)
@@ -43,10 +43,6 @@
soprano = callPackage ./support/soprano { };
- qca2 = callPackage ./support/qca2 { };
-
- qca2_ossl = callPackage ./support/qca2/ossl.nix { };
-
qimageblitz = callPackage ./support/qimageblitz { };
### LIBS
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Tue Feb 22 09:52:54
2011 (r26052)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.6/default.nix Tue Feb 22 09:53:01
2011 (r26053)
@@ -42,10 +42,6 @@
soprano = callPackage ./support/soprano { };
- qca2 = callPackage ./support/qca2 { };
-
- qca2_ossl = callPackage ./support/qca2/ossl.nix { };
-
qimageblitz = callPackage ./support/qimageblitz { };
### LIBS
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/qca2/default.nix
(from r26052, nixpkgs/trunk/pkgs/desktops/kde-4.6/support/qca2/default.nix)
==============================================================================
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/qca2/ossl.nix
(from r26052, nixpkgs/trunk/pkgs/desktops/kde-4.6/support/qca2/ossl.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 22 09:52:54
2011 (r26052)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 22 09:53:01
2011 (r26053)
@@ -3978,6 +3978,10 @@
ptlib = callPackage ../development/libraries/ptlib {};
+ qca2 = callPackage ../development/libraries/qca2 {};
+
+ qca2_ossl = callPackage ../development/libraries/qca2/ossl.nix {};
+
qjson = callPackage ../development/libraries/qjson { };
qt3 = callPackage ../development/libraries/qt-3 {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
