From 2e5edbfd99c4eb01cdb08e6735879701dbdc2fc7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Aug 2016 20:51:27 +0000 Subject: [PATCH] gnustep: move to pkgs/desktops/gnustep --- .../libraries => desktops}/gnustep/back/default.nix | 0 .../libraries => desktops}/gnustep/back/fixup-tools.patch | 0 .../libraries => desktops}/gnustep/base/default.nix | 0 .../gnustep/base/fixup-base-makefile-installdir.patch | 0 .../libraries => desktops}/gnustep/base/fixup-paths.patch | 0 pkgs/{development/libraries => desktops}/gnustep/default.nix | 0 .../libraries => desktops}/gnustep/gorm/default.nix | 0 .../libraries => desktops}/gnustep/gorm/fix-gs-makefiles.patch | 0 .../{development/libraries => desktops}/gnustep/gui/default.nix | 0 .../libraries => desktops}/gnustep/gui/fixup-all.patch | 0 .../gnustep/gui/fixup-gui-makefile-installdir.patch | 0 .../gnustep/gui/fixup-gui-textconverters-preamble.patch | 0 .../gnustep/gui/fixup-gui-tools-preamble.patch | 0 .../libraries => desktops}/gnustep/gworkspace/default.nix | 0 .../libraries => desktops}/gnustep/libobjc2/default.nix | 0 .../libraries => desktops}/gnustep/make/GNUstep.conf | 0 .../{development/libraries => desktops}/gnustep/make/builder.sh | 0 .../libraries => desktops}/gnustep/make/default.nix | 0 .../libraries => desktops}/gnustep/make/fixup-paths.patch | 0 .../gnustep/make/gs-makefiles-additional.patch | 0 .../libraries => desktops}/gnustep/make/gsmakeDerivation.nix | 0 .../libraries => desktops}/gnustep/make/setup-hook.sh | 0 .../{development/libraries => desktops}/gnustep/make/wrapper.sh | 0 .../libraries => desktops}/gnustep/projectcenter/default.nix | 0 .../gnustep/projectcenter/fixup-preamble.patch | 0 .../gnustep/systempreferences/default.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 27 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries => desktops}/gnustep/back/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/back/fixup-tools.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/base/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/base/fixup-base-makefile-installdir.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/base/fixup-paths.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/gorm/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/gorm/fix-gs-makefiles.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/gui/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/gui/fixup-all.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/gui/fixup-gui-makefile-installdir.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/gui/fixup-gui-textconverters-preamble.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/gui/fixup-gui-tools-preamble.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/gworkspace/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/libobjc2/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/GNUstep.conf (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/builder.sh (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/fixup-paths.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/gs-makefiles-additional.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/gsmakeDerivation.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/setup-hook.sh (100%) rename pkgs/{development/libraries => desktops}/gnustep/make/wrapper.sh (100%) rename pkgs/{development/libraries => desktops}/gnustep/projectcenter/default.nix (100%) rename pkgs/{development/libraries => desktops}/gnustep/projectcenter/fixup-preamble.patch (100%) rename pkgs/{development/libraries => desktops}/gnustep/systempreferences/default.nix (100%) diff --git a/pkgs/development/libraries/gnustep/back/default.nix b/pkgs/desktops/gnustep/back/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/back/default.nix rename to pkgs/desktops/gnustep/back/default.nix diff --git a/pkgs/development/libraries/gnustep/back/fixup-tools.patch b/pkgs/desktops/gnustep/back/fixup-tools.patch similarity index 100% rename from pkgs/development/libraries/gnustep/back/fixup-tools.patch rename to pkgs/desktops/gnustep/back/fixup-tools.patch diff --git a/pkgs/development/libraries/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/base/default.nix rename to pkgs/desktops/gnustep/base/default.nix diff --git a/pkgs/development/libraries/gnustep/base/fixup-base-makefile-installdir.patch b/pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch similarity index 100% rename from pkgs/development/libraries/gnustep/base/fixup-base-makefile-installdir.patch rename to pkgs/desktops/gnustep/base/fixup-base-makefile-installdir.patch diff --git a/pkgs/development/libraries/gnustep/base/fixup-paths.patch b/pkgs/desktops/gnustep/base/fixup-paths.patch similarity index 100% rename from pkgs/development/libraries/gnustep/base/fixup-paths.patch rename to pkgs/desktops/gnustep/base/fixup-paths.patch diff --git a/pkgs/development/libraries/gnustep/default.nix b/pkgs/desktops/gnustep/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/default.nix rename to pkgs/desktops/gnustep/default.nix diff --git a/pkgs/development/libraries/gnustep/gorm/default.nix b/pkgs/desktops/gnustep/gorm/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/gorm/default.nix rename to pkgs/desktops/gnustep/gorm/default.nix diff --git a/pkgs/development/libraries/gnustep/gorm/fix-gs-makefiles.patch b/pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch similarity index 100% rename from pkgs/development/libraries/gnustep/gorm/fix-gs-makefiles.patch rename to pkgs/desktops/gnustep/gorm/fix-gs-makefiles.patch diff --git a/pkgs/development/libraries/gnustep/gui/default.nix b/pkgs/desktops/gnustep/gui/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/gui/default.nix rename to pkgs/desktops/gnustep/gui/default.nix diff --git a/pkgs/development/libraries/gnustep/gui/fixup-all.patch b/pkgs/desktops/gnustep/gui/fixup-all.patch similarity index 100% rename from pkgs/development/libraries/gnustep/gui/fixup-all.patch rename to pkgs/desktops/gnustep/gui/fixup-all.patch diff --git a/pkgs/development/libraries/gnustep/gui/fixup-gui-makefile-installdir.patch b/pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch similarity index 100% rename from pkgs/development/libraries/gnustep/gui/fixup-gui-makefile-installdir.patch rename to pkgs/desktops/gnustep/gui/fixup-gui-makefile-installdir.patch diff --git a/pkgs/development/libraries/gnustep/gui/fixup-gui-textconverters-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch similarity index 100% rename from pkgs/development/libraries/gnustep/gui/fixup-gui-textconverters-preamble.patch rename to pkgs/desktops/gnustep/gui/fixup-gui-textconverters-preamble.patch diff --git a/pkgs/development/libraries/gnustep/gui/fixup-gui-tools-preamble.patch b/pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch similarity index 100% rename from pkgs/development/libraries/gnustep/gui/fixup-gui-tools-preamble.patch rename to pkgs/desktops/gnustep/gui/fixup-gui-tools-preamble.patch diff --git a/pkgs/development/libraries/gnustep/gworkspace/default.nix b/pkgs/desktops/gnustep/gworkspace/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/gworkspace/default.nix rename to pkgs/desktops/gnustep/gworkspace/default.nix diff --git a/pkgs/development/libraries/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/libobjc2/default.nix rename to pkgs/desktops/gnustep/libobjc2/default.nix diff --git a/pkgs/development/libraries/gnustep/make/GNUstep.conf b/pkgs/desktops/gnustep/make/GNUstep.conf similarity index 100% rename from pkgs/development/libraries/gnustep/make/GNUstep.conf rename to pkgs/desktops/gnustep/make/GNUstep.conf diff --git a/pkgs/development/libraries/gnustep/make/builder.sh b/pkgs/desktops/gnustep/make/builder.sh similarity index 100% rename from pkgs/development/libraries/gnustep/make/builder.sh rename to pkgs/desktops/gnustep/make/builder.sh diff --git a/pkgs/development/libraries/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/make/default.nix rename to pkgs/desktops/gnustep/make/default.nix diff --git a/pkgs/development/libraries/gnustep/make/fixup-paths.patch b/pkgs/desktops/gnustep/make/fixup-paths.patch similarity index 100% rename from pkgs/development/libraries/gnustep/make/fixup-paths.patch rename to pkgs/desktops/gnustep/make/fixup-paths.patch diff --git a/pkgs/development/libraries/gnustep/make/gs-makefiles-additional.patch b/pkgs/desktops/gnustep/make/gs-makefiles-additional.patch similarity index 100% rename from pkgs/development/libraries/gnustep/make/gs-makefiles-additional.patch rename to pkgs/desktops/gnustep/make/gs-makefiles-additional.patch diff --git a/pkgs/development/libraries/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix similarity index 100% rename from pkgs/development/libraries/gnustep/make/gsmakeDerivation.nix rename to pkgs/desktops/gnustep/make/gsmakeDerivation.nix diff --git a/pkgs/development/libraries/gnustep/make/setup-hook.sh b/pkgs/desktops/gnustep/make/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/gnustep/make/setup-hook.sh rename to pkgs/desktops/gnustep/make/setup-hook.sh diff --git a/pkgs/development/libraries/gnustep/make/wrapper.sh b/pkgs/desktops/gnustep/make/wrapper.sh similarity index 100% rename from pkgs/development/libraries/gnustep/make/wrapper.sh rename to pkgs/desktops/gnustep/make/wrapper.sh diff --git a/pkgs/development/libraries/gnustep/projectcenter/default.nix b/pkgs/desktops/gnustep/projectcenter/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/projectcenter/default.nix rename to pkgs/desktops/gnustep/projectcenter/default.nix diff --git a/pkgs/development/libraries/gnustep/projectcenter/fixup-preamble.patch b/pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch similarity index 100% rename from pkgs/development/libraries/gnustep/projectcenter/fixup-preamble.patch rename to pkgs/desktops/gnustep/projectcenter/fixup-preamble.patch diff --git a/pkgs/development/libraries/gnustep/systempreferences/default.nix b/pkgs/desktops/gnustep/systempreferences/default.nix similarity index 100% rename from pkgs/development/libraries/gnustep/systempreferences/default.nix rename to pkgs/desktops/gnustep/systempreferences/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 131fe12e5f58..62db994a83ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6444,7 +6444,7 @@ in gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; gnumake = self.gnumake42; - gnustep = recurseIntoAttrs (callPackage ../development/libraries/gnustep {}); + gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); gob2 = callPackage ../development/tools/misc/gob2 { };