From 84036dfd8b1890f74b81bab55f2678cc99f233a6 Mon Sep 17 00:00:00 2001 From: NOTtheMessiah Date: Tue, 5 Aug 2014 03:22:41 -0400 Subject: [PATCH 1/4] Added gcolor2 --- .../applications/graphics/gcolor2/default.nix | 29 ++++++++++++ .../graphics/gcolor2/gcolor2-amd64.patch | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 77 insertions(+) create mode 100644 pkgs/applications/graphics/gcolor2/default.nix create mode 100644 pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix new file mode 100644 index 00000000000..673cf626a54 --- /dev/null +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } : + +let version = "0.4"; in +stdenv.mkDerivation { + name = "gcolor2-${version}"; + arch = if stdenv.system == "x86_64-linux" then "amd64" else "386"; + + src = fetchurl { + url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2"; + sha1 = "e410a52dcff3d5c6c3d448b68a026d04ccd744be"; + + }; + + preConfigure = '' + sed -i 's/\[:space:\]/[&]/g' configure + ''; + + # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches + patches = if stdenv.system == "x86_64-linux" then + [ ./gcolor2-amd64.patch ] else + [ ]; + +buildInputs = [ gtk perl perlXMLParser pkgconfig ]; + + meta = { + description = "Simple GTK+2 color selector"; + homepage = http://gcolor2.sourceforge.net/; + }; +} diff --git a/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch new file mode 100644 index 00000000000..cd06a8315f9 --- /dev/null +++ b/pkgs/applications/graphics/gcolor2/gcolor2-amd64.patch @@ -0,0 +1,46 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c +--- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 ++++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 +@@ -4,6 +4,9 @@ + + #include + #include ++#include ++#include ++#include + + #include "callbacks.h" + #include "interface.h" +@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate + gtk_clipboard_set_text (cb, hex, strlen (hex)); + } + ++void add_rgb_file (gchar *filename, gchar *type); ++gchar* get_system_file (void); ++ + void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data) + { + if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) +@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton * + gtk_widget_destroy (savedialog); + } + ++void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color); ++ + void add_color_to_treeview () + { + GtkTreeView *treeview; +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c +--- gcolor2-0.4.orig/src/main.c 2005-07-11 10:55:49.000000000 -0400 ++++ gcolor2-0.4/src/main.c 2007-02-17 19:18:23.000000000 -0500 +@@ -4,6 +4,10 @@ + + #include + #include ++#include ++#include ++#include ++#include + + #include "interface.h" + #include "support.h" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a46693b9235..1a0e618dcff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8727,6 +8727,8 @@ let fuze = callPackage ../applications/networking/instant-messengers/fuze {}; + gcolor2 = callPackage ../applications/graphics/gcolor2 { }; + get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { From 9e6d1da34b012465c0af0429ca8d5e784fcb007b Mon Sep 17 00:00:00 2001 From: NOTtheMessiah Date: Tue, 5 Aug 2014 10:55:55 -0400 Subject: [PATCH 2/4] Update default.nix --- pkgs/applications/graphics/gcolor2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 673cf626a54..0af750ec989 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -25,5 +25,7 @@ buildInputs = [ gtk perl perlXMLParser pkgconfig ]; meta = { description = "Simple GTK+2 color selector"; homepage = http://gcolor2.sourceforge.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; }; } From 36480116b412a10985644cd8100a30c4d827ea40 Mon Sep 17 00:00:00 2001 From: NOTtheMessiah Date: Tue, 5 Aug 2014 10:58:24 -0400 Subject: [PATCH 3/4] added license for gcolor2 and myself to maintainers --- lib/maintainers.nix | 1 + pkgs/applications/graphics/gcolor2/default.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a4386b067b5..4091e2d405a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -65,6 +65,7 @@ modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; msackman = "Matthew Sackman "; + notthemessiah = "Brian Cohen "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; orbitz = "Malcolm Matalka "; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 673cf626a54..0af750ec989 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -25,5 +25,7 @@ buildInputs = [ gtk perl perlXMLParser pkgconfig ]; meta = { description = "Simple GTK+2 color selector"; homepage = http://gcolor2.sourceforge.net/; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; }; } From fea19a1fd68c10a8076ad880cf2ddb9a55101993 Mon Sep 17 00:00:00 2001 From: Brian Cohen Date: Fri, 15 Aug 2014 21:26:11 -0400 Subject: [PATCH 4/4] Added implicit and storableEndian to haskellPackages for ImplicitCAD --- .../libraries/haskell/implicit/default.nix | 25 +++++++++++++++++++ .../haskell/storable-endian/default.nix | 15 +++++++++++ pkgs/top-level/haskell-packages.nix | 4 +++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/haskell/implicit/default.nix create mode 100644 pkgs/development/libraries/haskell/storable-endian/default.nix diff --git a/pkgs/development/libraries/haskell/implicit/default.nix b/pkgs/development/libraries/haskell/implicit/default.nix new file mode 100644 index 00000000000..39013aff28f --- /dev/null +++ b/pkgs/development/libraries/haskell/implicit/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, blazeBuilder, blazeMarkup, blazeSvg, deepseq, filepath +, JuicyPixels, mtl, NumInstances, optparseApplicative, parallel +, parsec, storableEndian, text, unorderedContainers, vectorSpace +}: + +cabal.mkDerivation (self: { + pname = "implicit"; + version = "0.0.3"; + sha256 = "0zsd25gd0c4sp1ipjnsbn1gbdl6s0y2vy8n4nwn3dxgrv75cd1l9"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + blazeBuilder blazeMarkup blazeSvg deepseq filepath JuicyPixels mtl + NumInstances optparseApplicative parallel parsec storableEndian + text unorderedContainers vectorSpace + ]; + meta = { + homepage = "https://github.com/colah/ImplicitCAD"; + description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.."; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/storable-endian/default.nix b/pkgs/development/libraries/haskell/storable-endian/default.nix new file mode 100644 index 00000000000..9fdbdb5a6b0 --- /dev/null +++ b/pkgs/development/libraries/haskell/storable-endian/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, byteorder }: + +cabal.mkDerivation (self: { + pname = "storable-endian"; + version = "0.2.5"; + sha256 = "04j1nk0wga4dqrqvhm8yd9h9194db1n3yrnhg8s3gsc0jk7yw1p2"; + buildDepends = [ byteorder ]; + meta = { + description = "Storable instances with endianness"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3fc3aa5ffe1..0bbacbd36b0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1321,6 +1321,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in imm = callPackage ../development/libraries/haskell/imm {}; + implicit = callPackage ../development/libraries/haskell/implicit {}; + indents = callPackage ../development/libraries/haskell/indents {}; indexed = callPackage ../development/libraries/haskell/indexed {}; @@ -2302,6 +2304,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in storableComplex = callPackage ../development/libraries/haskell/storable-complex {}; + storableEndian = callPackage ../development/libraries/haskell/storable-endian {}; + storableRecord = callPackage ../development/libraries/haskell/storable-record {}; Stream = callPackage ../development/libraries/haskell/Stream {};