about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/cudatoolkit/5.5.nix3
-rw-r--r--pkgs/development/compilers/cudatoolkit/6.0.nix3
-rw-r--r--pkgs/development/compilers/cudatoolkit/setup-hook.sh8
-rw-r--r--pkgs/development/libraries/haskell/diagrams/cairo.nix6
-rw-r--r--pkgs/development/libraries/haskell/diagrams/contrib.nix6
-rw-r--r--pkgs/development/libraries/haskell/diagrams/core.nix6
-rw-r--r--pkgs/development/libraries/haskell/diagrams/lib.nix6
-rw-r--r--pkgs/development/libraries/haskell/diagrams/postscript.nix7
-rw-r--r--pkgs/development/libraries/haskell/diagrams/svg.nix6
-rw-r--r--pkgs/development/libraries/haskell/force-layout/default.nix6
-rw-r--r--pkgs/development/libraries/skalibs/default.nix58
-rw-r--r--pkgs/development/libraries/skalibs/getpeereid.patch28
-rw-r--r--pkgs/servers/s6/default.nix57
-rw-r--r--pkgs/tools/misc/execline/default.nix54
-rw-r--r--pkgs/top-level/all-packages.nix6
15 files changed, 238 insertions, 22 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix
index 99f0828012fa..bf4009f08be3 100644
--- a/pkgs/development/compilers/cudatoolkit/5.5.nix
+++ b/pkgs/development/compilers/cudatoolkit/5.5.nix
@@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
     perl ./install-linux.pl --prefix="$out"
     rm $out/tools/CUDA_Occupancy_Calculator.xls
     perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+    mv $out/include $out/usr_include
   '';
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     license = [ "nonfree" ];
   };
diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix
index 573cc8262216..5da4b3d0a4aa 100644
--- a/pkgs/development/compilers/cudatoolkit/6.0.nix
+++ b/pkgs/development/compilers/cudatoolkit/6.0.nix
@@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
     perl ./install-linux.pl --prefix="$out"
     rm $out/tools/CUDA_Occupancy_Calculator.xls
     perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+    mv $out/include $out/usr_include
   '';
 
+  setupHook = ./setup-hook.sh;
+
   meta = {
     license = [ "nonfree" ];
   };
diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh
new file mode 100644
index 000000000000..1b75a2e91ba2
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/setup-hook.sh
@@ -0,0 +1,8 @@
+addIncludePath () {
+    if test -d "$1/usr_include"
+    then
+        export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include"
+    fi
+}
+
+envHooks=(${envHooks[@]} addIncludePath)
diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index c0f678311b9a..c8763ca0a453 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -7,18 +7,18 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "1.2";
-  sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l";
+  version = "1.2.0.1";
+  sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c";
   buildDepends = [
     cairo colour dataDefaultClass diagramsCore diagramsLib filepath
     hashable JuicyPixels lens mtl optparseApplicative pango split
     statestack time transformers vector
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Cairo backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 2dcc86d5c9b4..7c9e797e3057 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -9,8 +9,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "1.1.2";
-  sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g";
+  version = "1.1.2.1";
+  sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki";
   buildDepends = [
     arithmoi circlePacking colour dataDefault dataDefaultClass
     diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec
@@ -20,11 +20,11 @@ cabal.mkDerivation (self: {
     diagramsLib HUnit QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "Collection of user contributions to diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index 9a1245d04d0a..c7459972c394 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -6,17 +6,17 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "1.2.0.1";
-  sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps";
+  version = "1.2.0.2";
+  sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn";
   buildDepends = [
     dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Core libraries for diagrams EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 77047d982917..75ee478ac3fc 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -8,19 +8,19 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "1.2.0.1";
-  sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4";
+  version = "1.2.0.2";
+  sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p";
   buildDepends = [
     active colour dataDefaultClass diagramsCore dualTree filepath
     fingertree hashable intervals JuicyPixels lens MemoTrie
     monoidExtras optparseApplicative safe semigroups tagged vectorSpace
     vectorSpacePoints
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams";
     description = "Embedded domain-specific language for declarative graphics";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix
index 6ecd2dd4a410..c79f637c73f6 100644
--- a/pkgs/development/libraries/haskell/diagrams/postscript.nix
+++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-postscript";
-  version = "1.1";
-  sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m";
+  version = "1.1.0.1";
+  sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6";
   buildDepends = [
     dataDefaultClass diagramsCore diagramsLib dlist filepath hashable
     lens monoidExtras mtl semigroups split vectorSpace
@@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
     description = "Postscript backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    broken = true;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index f982f427863b..fcd08ffce63a 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -7,18 +7,18 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "1.1";
-  sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1";
+  version = "1.1.0.1";
+  sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw";
   buildDepends = [
     base64Bytestring blazeMarkup blazeSvg colour diagramsCore
     diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl
     split time vectorSpace
   ];
-  jailbreak = true;
   meta = {
     homepage = "http://projects.haskell.org/diagrams/";
     description = "SVG backend for diagrams drawing EDSL";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix
index 77259cc1e401..f0f8ae1399db 100644
--- a/pkgs/development/libraries/haskell/force-layout/default.nix
+++ b/pkgs/development/libraries/haskell/force-layout/default.nix
@@ -4,15 +4,15 @@
 
 cabal.mkDerivation (self: {
   pname = "force-layout";
-  version = "0.3.0.6";
-  sha256 = "0qmzz9gbzf1jdk08w3nhnw7l3n5bq5sw5k4r0mdc5y11m38xpgm4";
+  version = "0.3.0.7";
+  sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy";
   buildDepends = [
     dataDefaultClass lens vectorSpace vectorSpacePoints
   ];
-  jailbreak = true;
   meta = {
     description = "Simple force-directed layout";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.bergey ];
   };
 })
diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
new file mode 100644
index 000000000000..842d74848df6
--- /dev/null
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -0,0 +1,58 @@
+{stdenv, fetchurl}:
+
+let
+
+  version = "1.6.0.0";
+
+in stdenv.mkDerivation rec {
+  name = "skalibs-${version}";
+
+  src = fetchurl {
+    url = "http://skarnet.org/software/skalibs/${name}.tar.gz";
+    sha256 = "0jz3farll9n5jvz3g6wri99s6njkgmnf0r9jqjlg03f20dzv8c8w";
+  };
+
+  sourceRoot = "prog/${name}";
+
+  # See http://skarnet.org/cgi-bin/archive.cgi?1:mss:75:201405:pkmodhckjklemogbplje
+  patches = [ ./getpeereid.patch ];
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"     > conf-defaultpath
+    printf "$out/etc"     > conf-etc
+    printf "$out/bin"     > conf-install-command
+    printf "$out/include" > conf-install-include
+    printf "$out/libexec" > conf-install-libexec
+    printf "$out/lib"     > conf-install-library
+    printf "$out/lib"     > conf-install-library.so
+    printf "$out/sysdeps" > conf-install-sysdeps
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+    touch flag-forcedevr
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/etc"
+  '';
+
+  meta = {
+    homepage = http://skarnet.org/software/skalibs/;
+    description = "A set of general-purpose C programming libraries.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/development/libraries/skalibs/getpeereid.patch b/pkgs/development/libraries/skalibs/getpeereid.patch
new file mode 100644
index 000000000000..c366780e2670
--- /dev/null
+++ b/pkgs/development/libraries/skalibs/getpeereid.patch
@@ -0,0 +1,28 @@
+--- a/src/libstddjb/getpeereid.h
++++ b/src/libstddjb/getpeereid.h
+@@ -3,6 +3,14 @@
+ #ifndef GETPEEREID_H
+ #define GETPEEREID_H
+ 
++#include "sysdeps.h"
++
++#ifdef HASGETPEEREID
++/* syscall exists - do nothing */
++
++#else
++
+ extern int getpeereid (int, int *, int *) ;
+ 
+ #endif
++#endif
+--- a/src/libstddjb/ipc_eid.c
++++ b/src/libstddjb/ipc_eid.c
+@@ -5,7 +5,7 @@
+ 
+ int ipc_eid (int s, unsigned int *u, unsigned int *g)
+ {
+-  int dummyu, dummyg ;
++  unsigned int dummyu, dummyg ;
+   if (getpeereid(s, &dummyu, &dummyg) < 0) return -1 ;
+   *u = (unsigned int)dummyu ;
+   *g = (unsigned int)dummyg ;
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix
new file mode 100644
index 000000000000..045e31207ba0
--- /dev/null
+++ b/pkgs/servers/s6/default.nix
@@ -0,0 +1,57 @@
+{stdenv, fetchurl, skalibs, execline}:
+
+let
+
+  version = "1.1.3.2";
+
+in stdenv.mkDerivation rec {
+
+  name = "s6-${version}";
+
+  src = fetchurl {
+    url = "http://www.skarnet.org/software/s6/${name}.tar.gz";
+    sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp";
+  };
+
+  buildInputs = [ skalibs execline ];
+
+  sourceRoot = "admin/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"           > conf-install-command
+    printf "$out/include"       > conf-install-include
+    printf "$out/lib"           > conf-install-library
+    printf "$out/lib"           > conf-install-library.so
+    printf "$out/sysdeps"       > conf-install-sysdeps
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    printf "${skalibs}/sysdeps" > import
+    printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include
+    printf "%s\n%s" "${skalibs}/lib"     "${execline}/lib"     > path-library
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    substituteInPlace "src/daemontools-extras/s6-log.c" \
+      --replace '"execlineb"' '"${execline}/bin/execlineb"'
+
+    patchShebangs src/sys
+  '';
+
+  meta = {
+    homepage = http://www.skarnet.org/software/s6/;
+    description = "skarnet.org's small & secure supervision software suite.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
new file mode 100644
index 000000000000..ba0784138b31
--- /dev/null
+++ b/pkgs/tools/misc/execline/default.nix
@@ -0,0 +1,54 @@
+{stdenv, fetchurl, skalibs}:
+
+let
+
+  version = "1.3.1.1";
+
+in stdenv.mkDerivation rec {
+
+  name = "execline-${version}";
+
+  src = fetchurl {
+    url = "http://skarnet.org/software/execline/${name}.tar.gz";
+    sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg";
+  };
+
+  buildInputs = [ skalibs ];
+
+  sourceRoot = "admin/${name}";
+
+  configurePhase = ''
+    pushd conf-compile
+
+    printf "$out/bin"     > conf-install-command
+    printf "$out/include" > conf-install-include
+    printf "$out/lib"     > conf-install-library
+    printf "$out/lib"     > conf-install-library.so
+    printf "$out/sysdeps" > conf-install-sysdeps
+
+    printf "${skalibs}/sysdeps" > import
+    printf "${skalibs}/include" > path-include
+    printf "${skalibs}/lib"     > path-library
+
+    # let nix builder strip things, cross-platform
+    truncate --size 0 conf-stripbins
+    truncate --size 0 conf-striplibs
+
+    rm -f flag-slashpackage
+    touch flag-allstatic
+
+    popd
+  '';
+
+  preBuild = ''
+    patchShebangs src/sys
+  '';
+
+  meta = {
+    homepage = http://skarnet.org/software/execline/;
+    description = "A small scripting language, to be used in place of a shell in non-interactive scripts.";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.isc;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15da2e5e4e1e..8f5ce8da047e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -987,6 +987,8 @@ let
 
   exempi = callPackage ../development/libraries/exempi { };
 
+  execline = callPackage ../tools/misc/execline { };
+
   exercism = callPackage ../development/tools/exercism { };
 
   exif = callPackage ../tools/graphics/exif { };
@@ -6169,6 +6171,8 @@ let
 
   sfml_git = callPackage ../development/libraries/sfml { };
 
+  skalibs = callPackage ../development/libraries/skalibs { };
+
   slang = callPackage ../development/libraries/slang { };
 
   slibGuile = callPackage ../development/libraries/slib {
@@ -6978,6 +6982,8 @@ let
 
   rippled = callPackage ../servers/rippled { };
 
+  s6 = callPackage ../servers/s6 { };
+
   spamassassin = callPackage ../servers/mail/spamassassin {
     inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile
       HTTPDate MailDKIM LWP IOSocketSSL;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-06 10:05:07 +0000