From d8fc6c75fee1f19e08ddb637ed382d0d95420bf9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:12:39 -0400 Subject: [PATCH 01/29] Remove jdt-sdk The package is dead, the links no longer available. --- pkgs/development/eclipse/jdt-sdk/builder.sh | 7 ------- pkgs/development/eclipse/jdt-sdk/default.nix | 15 --------------- pkgs/top-level/all-packages.nix | 18 ++++++++---------- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100755 pkgs/development/eclipse/jdt-sdk/builder.sh delete mode 100644 pkgs/development/eclipse/jdt-sdk/default.nix diff --git a/pkgs/development/eclipse/jdt-sdk/builder.sh b/pkgs/development/eclipse/jdt-sdk/builder.sh deleted file mode 100755 index 40de662b775f..000000000000 --- a/pkgs/development/eclipse/jdt-sdk/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -e - -source $stdenv/setup - -unzip $src -mkdir $out -mv eclipse $out/ diff --git a/pkgs/development/eclipse/jdt-sdk/default.nix b/pkgs/development/eclipse/jdt-sdk/default.nix deleted file mode 100644 index 40d1589f770d..000000000000 --- a/pkgs/development/eclipse/jdt-sdk/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, fetchurl, unzip}: - -stdenv.mkDerivation ( rec { - pname = "eclipse-JDT-SDK"; - version = "3.3.2"; - name = "${pname}-${version}"; - - builder = ./builder.sh; - src = fetchurl { - url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-JDT-SDK-3.3.2.zip; - md5 = "f9e513b7e3b609feef28651c07807b17"; - }; - - buildInputs = [unzip]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31d0cd2c1507..fa49a691215e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2450,13 +2450,13 @@ in enableNpm = false; }; - nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - }; - - nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { - libtool = darwin.cctools; - enableNpm = false; + nodejs-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + }; + + nodejs-slim-7_x = callPackage ../development/web/nodejs/v7.nix { + libtool = darwin.cctools; + enableNpm = false; }; nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { @@ -3420,7 +3420,7 @@ in rtmpdump_gnutls = rtmpdump.override { gnutlsSupport = true; opensslSupport = false; }; reaverwps = callPackage ../tools/networking/reaver-wps {}; - + reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; recordmydesktop = callPackage ../applications/video/recordmydesktop { }; @@ -5694,8 +5694,6 @@ in ecj = callPackage ../development/eclipse/ecj { }; - jdtsdk = callPackage ../development/eclipse/jdt-sdk { }; - jruby = callPackage ../development/interpreters/jruby { }; jython = callPackage ../development/interpreters/jython {}; From 4e50480757d78b6b3a7d4c95923286b07a758a8e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:16:29 -0400 Subject: [PATCH 02/29] Remove abc The package does not build and the links are no longer available --- .../compilers/abc/builder-binjar.sh | 4 - pkgs/development/compilers/abc/builder.sh | 40 ---------- pkgs/development/compilers/abc/default.nix | 79 ------------------- .../compilers/abc/jasmin/builder.sh | 24 ------ .../compilers/abc/jasmin/default.nix | 14 ---- .../compilers/abc/polyglot/builder.sh | 11 --- .../compilers/abc/polyglot/default.nix | 13 --- .../development/compilers/abc/soot/builder.sh | 19 ----- .../compilers/abc/soot/default.nix | 14 ---- pkgs/top-level/all-packages.nix | 2 - 10 files changed, 220 deletions(-) delete mode 100644 pkgs/development/compilers/abc/builder-binjar.sh delete mode 100644 pkgs/development/compilers/abc/builder.sh delete mode 100644 pkgs/development/compilers/abc/default.nix delete mode 100644 pkgs/development/compilers/abc/jasmin/builder.sh delete mode 100644 pkgs/development/compilers/abc/jasmin/default.nix delete mode 100644 pkgs/development/compilers/abc/polyglot/builder.sh delete mode 100644 pkgs/development/compilers/abc/polyglot/default.nix delete mode 100644 pkgs/development/compilers/abc/soot/builder.sh delete mode 100644 pkgs/development/compilers/abc/soot/default.nix diff --git a/pkgs/development/compilers/abc/builder-binjar.sh b/pkgs/development/compilers/abc/builder-binjar.sh deleted file mode 100644 index a954c49aa3f6..000000000000 --- a/pkgs/development/compilers/abc/builder-binjar.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -cp $src $out/jars/$jarname.jar diff --git a/pkgs/development/compilers/abc/builder.sh b/pkgs/development/compilers/abc/builder.sh deleted file mode 100644 index ba5940238426..000000000000 --- a/pkgs/development/compilers/abc/builder.sh +++ /dev/null @@ -1,40 +0,0 @@ -source $stdenv/setup - -tar zxvf $src - -cd abc-* - -for p in $patches; do - echo "applying patch $p" - patch -p1 < $p -done - -cat > ant.settings < $out/bin/abc < build-tmp.xml -mv build-tmp.xml build.xml - -cat > ant.settings < ant.settings < Date: Thu, 3 Nov 2016 21:19:01 -0400 Subject: [PATCH 03/29] Remove clanlib Does not build, website no longer exists --- .../development/libraries/clanlib/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/clanlib/default.nix diff --git a/pkgs/development/libraries/clanlib/default.nix b/pkgs/development/libraries/clanlib/default.nix deleted file mode 100644 index d4d46dd696c1..000000000000 --- a/pkgs/development/libraries/clanlib/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ -stdenv, fetchurl, zlib, -libpng, libjpeg, libvorbis, libogg, -libX11, xf86vidmodeproto, libXxf86vm, libXmu, mesa -}: - -stdenv.mkDerivation { - name = "clanlib-0.8.0"; - src = fetchurl { - url = http://www.clanlib.org/download/releases-0.8/ClanLib-0.8.0.tgz; - sha256 = "1rjr601h3hisrhvpkrj00wirx5hyfbppv9rla400wx7a42xvvyfy"; - }; - - buildInputs = [zlib libpng libjpeg - libvorbis libogg libX11 - xf86vidmodeproto libXmu - mesa libXxf86vm - ]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c2ab9cc5e0..13a794628fa1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6655,8 +6655,6 @@ in cl = callPackage ../development/libraries/cl { }; - clanlib = callPackage ../development/libraries/clanlib { }; - classads = callPackage ../development/libraries/classads { }; classpath = callPackage ../development/libraries/java/classpath { From c36a1d650239e5be17a369e7b912f76ffcea7849 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:33:19 -0400 Subject: [PATCH 04/29] paml: 4.2a -> 4.9c --- pkgs/applications/science/biology/paml/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index cec0aa7e5eba..589c2809a931 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.2a"; + version = "4.9c"; name = "paml-${version}"; src = fetchurl { - url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tar.gz"; - sha256 = "0yywyrjgxrpavp50n00l01pl90b7pykgb2k53yrlykz9dnf583pb"; + url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz"; + sha256 = "18a1l47223l7jyjavm8a8la84q9k9kbxwmj7kz4z3pdx70qrl04j"; }; preBuild = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' mkdir -pv $out/bin - cp -v codeml $out/bin + cp -v codeml $out/bin cp -v baseml $out/bin cp -v basemlg $out/bin cp -v chi2 $out/bin @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Phylogenetic Analysis by Maximum Likelihood (PAML)"; longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; license = "non-commercial"; - homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; + homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; }; } From df76eac6c6b03d87a2ed5e5652fd3b08997634cf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:34:28 -0400 Subject: [PATCH 05/29] Remove mcrl Does not build because source no longer exists --- pkgs/tools/misc/mcrl/default.nix | 14 -------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/tools/misc/mcrl/default.nix diff --git a/pkgs/tools/misc/mcrl/default.nix b/pkgs/tools/misc/mcrl/default.nix deleted file mode 100644 index bf5043e8b63a..000000000000 --- a/pkgs/tools/misc/mcrl/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, fetchurl, coreutils}: - -stdenv.mkDerivation { - name = "mcrl-2.18.4"; - src = fetchurl { - url = http://homepages.cwi.nl/~mcrl/mcrl-2.18.4.tar.gz ; - sha256 = "0gld7x3cv3y0vwjr1snz24xzr818sj1l2dfn8qhirfyhc7dnnqfw"; - }; - - RMPROG = "${coreutils}/bin/rm -f"; -} - - - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13a794628fa1..693341380fba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -884,8 +884,6 @@ in mathics = pythonPackages.mathics; - mcrl = callPackage ../tools/misc/mcrl { }; - meson = callPackage ../development/tools/build-managers/meson { }; mp3fs = callPackage ../tools/filesystems/mp3fs { }; From fd8d9098cbb2b9d6d2de4a3eac29edc6599c34f6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:40:35 -0400 Subject: [PATCH 06/29] Remove emacs stratego mode Does not build, no longer exists --- .../editors/emacs-modes/stratego/builder.sh | 4 ---- .../editors/emacs-modes/stratego/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 16 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/stratego/builder.sh delete mode 100644 pkgs/applications/editors/emacs-modes/stratego/default.nix diff --git a/pkgs/applications/editors/emacs-modes/stratego/builder.sh b/pkgs/applications/editors/emacs-modes/stratego/builder.sh deleted file mode 100644 index 7d734ec08884..000000000000 --- a/pkgs/applications/editors/emacs-modes/stratego/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/share/emacs/site-lisp -cp $src $out/share/emacs/site-lisp/stratego.el diff --git a/pkgs/applications/editors/emacs-modes/stratego/default.nix b/pkgs/applications/editors/emacs-modes/stratego/default.nix deleted file mode 100644 index bb4078d2d2d1..000000000000 --- a/pkgs/applications/editors/emacs-modes/stratego/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{stdenv, fetchsvn}: -stdenv.mkDerivation { - name = "stratego-mode"; - builder = ./builder.sh; - src = fetchsvn { - url = https://svn.strategoxt.org/repos/StrategoXT/stratego-editors/trunk/emacs/stratego.el; - rev = 12678; - sha256 = "4ab4ec587550233f29ca08b82fa0a9f7e5b33fc178348037e3ab1816bd60f538"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 693341380fba..2651abd99694 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12676,8 +12676,6 @@ in scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { }; scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { }; - stratego = callPackage ../applications/editors/emacs-modes/stratego { }; - structuredHaskellMode = haskellPackages.structured-haskell-mode; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; From 20c29806404679faaeb9f77520ea5cdf46c50f1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:43:17 -0400 Subject: [PATCH 07/29] Remove cryopid No longer builds / exists --- pkgs/os-specific/linux/cryopid/default.nix | 39 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/os-specific/linux/cryopid/default.nix diff --git a/pkgs/os-specific/linux/cryopid/default.nix b/pkgs/os-specific/linux/cryopid/default.nix deleted file mode 100644 index 0cb64bcc9753..000000000000 --- a/pkgs/os-specific/linux/cryopid/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, zlibStatic}: - -let - - pname = "cryopid"; - version = "20090908"; - revision = "7da69201d50e"; - -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://sharesource.org/hg/cryopid/archive/${revision}.tar.bz2"; - sha256 = "908a4b1cb26322ee25afe13ff59e0d86f669538cb4583766b15ca79fda6c69ca"; - }; - - buildInputs = [ zlibStatic ]; - - preBuild = "cd src"; - - installPhase = "mkdir -p $out/bin; cp cryopid $out/bin"; - - meta = { - description = "A process freezer for Linux"; - longDescription = '' - CryoPID allows you to capture the state of a running process in Linux - and save it to a file. This file can then be used to resume the process - later on, either after a reboot or even on another machines. - ''; - homepage = http://sharesource.org/project/cryopid; - license = '' - Modified BSD license (without advertising clause). CryoPID ships with - and links against the dietlibc library, which is distributed under the - GNU General Public Licence, version 2. - ''; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2651abd99694..8b7a1afbea57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10566,8 +10566,6 @@ in cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; - cryopid = callPackage ../os-specific/linux/cryopid { }; - criu = callPackage ../os-specific/linux/criu { }; cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; From 4e9186aaf3e5fca2f3f5e2a774a6f23630eb5e35 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:47:09 -0400 Subject: [PATCH 08/29] liblastfm: 0.3.2 -> 0.5 --- pkgs/development/libraries/liblastfmSF/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index 99f94bb82251..efe93ec02dfc 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, curl, openssl }: stdenv.mkDerivation rec { - name = "liblastfm-SF-0.3.2"; + name = "liblastfm-SF-0.5"; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ curl openssl ]; src = fetchurl { - url = "mirror://sourceforge/liblastfm/liblastfm-0.3.2.tar.gz"; - sha256 = "1hk62giysi96h6cyjyph69nlv1v4vw45w3sx7i2m89i9aysd6qp7"; + url = "mirror://sourceforge/liblastfm/libclastfm-0.5.tar.gz"; + sha256 = "0hpfflvfx6r4vvsbvdc564gkby8kr07p8ma7hgpxiy2pnlbpian9"; }; meta = { From 6d11e8ed4ca0e501894438cba1241c18a93d7c3d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 21:58:47 -0400 Subject: [PATCH 09/29] Remove pal2nal No longer build/exists --- .../science/biology/pal2nal/default.nix | 31 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/applications/science/biology/pal2nal/default.nix diff --git a/pkgs/applications/science/biology/pal2nal/default.nix b/pkgs/applications/science/biology/pal2nal/default.nix deleted file mode 100644 index 956f8b07e989..000000000000 --- a/pkgs/applications/science/biology/pal2nal/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{stdenv, fetchurl, perl, paml}: - -stdenv.mkDerivation { - name = "pal2nal-12"; - src = fetchurl { - url = http://coot.embl.de/pal2nal/distribution/pal2nal.v12.tar.gz; - sha256 = "1qj9sq5skpa7vyccl9gxc5ls85jwiq8j6mr8wvacz4yhyg0afy04"; - }; - - installPhase = '' - mkdir -p $out/bin - - cp -v pal2nal.pl $out/bin - - mkdir -p $out/doc - - cp -v README $out/doc - ''; - - meta = { - description = "Program for aligning nucleotide sequences based on an aminoacid alignment"; - longDescription = '' - PAL2NAL is a program that converts a multiple sequence alignment of proteins and the corresponding DNA (or mRNA) sequences into a codon alignment. The program automatically assigns the corresponding codon sequence even if the input DNA sequence has mismatches with the input protein sequence, or contains UTRs, polyA tails. It can also deal with frame shifts in the input alignment, which is suitable for the analysis of pseudogenes. The resulting codon alignment can further be subjected to the calculation of synonymous (KS) and non-synonymous (KA) substitution rates. - -If the input is a pair of sequences, PAL2NAL automatically calculates KS and KA by the codeml program in PAML. -''; - license = "non-commercial"; - homepage = http://coot.embl.de/pal2nal/; - pkgMaintainer = "Pjotr Prins"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b7a1afbea57..60066d719641 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16340,8 +16340,6 @@ in paml = callPackage ../applications/science/biology/paml { }; - pal2nal = callPackage ../applications/science/biology/pal2nal { }; - plink = callPackage ../applications/science/biology/plink/default.nix { }; samtools = callPackage ../applications/science/biology/samtools/default.nix { }; From ac44a1b6aaceee6f2070cd5e3baf14053caf0d0f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:02:28 -0400 Subject: [PATCH 10/29] Remove jetty_util --- .../libraries/java/jetty-util/default.nix | 13 ------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/java/jetty-util/default.nix diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix deleted file mode 100644 index 349339aad440..000000000000 --- a/pkgs/development/libraries/java/jetty-util/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "jetty-util-6.1.16"; - src = fetchurl { - url = http://repository.codehaus.org/org/mortbay/jetty/jetty-util/6.1.16/jetty-util-6.1.16.jar; - sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq"; - }; - buildCommand = '' - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60066d719641..5e2e02e74c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7424,8 +7424,6 @@ in jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; - jetty_util = callPackage ../development/libraries/java/jetty-util { }; - jshon = callPackage ../development/tools/parsing/jshon { }; json_glib = callPackage ../development/libraries/json-glib { }; From 66bdac04e8e5f860c2d598a37645b4309c925b4e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:02:48 -0400 Subject: [PATCH 11/29] Remove jetty_gwt --- .../libraries/java/jetty-gwt/default.nix | 13 ------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/java/jetty-gwt/default.nix diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix deleted file mode 100644 index 03433048270f..000000000000 --- a/pkgs/development/libraries/java/jetty-gwt/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "jetty-gwt-6.1.14"; - src = fetchurl { - url = http://repository.codehaus.org/org/mortbay/jetty/jetty-gwt/6.1.14/jetty-gwt-6.1.14.jar; - sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf"; - }; - buildCommand = '' - mkdir -p $out/share/java - cp $src $out/share/java/$name.jar - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e2e02e74c91..04aa5e01930e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7422,8 +7422,6 @@ in jemalloc = callPackage ../development/libraries/jemalloc { }; - jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { }; - jshon = callPackage ../development/tools/parsing/jshon { }; json_glib = callPackage ../development/libraries/json-glib { }; From ad43f28e0752c65e9c9b81c85d803877e4745c84 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:07:54 -0400 Subject: [PATCH 12/29] Remove Selenium Remote Control No longer builds and was a dodgy process anyways --- .../tools/selenium/remote-control/default.nix | 49 ------------------- pkgs/top-level/all-packages.nix | 5 -- 2 files changed, 54 deletions(-) delete mode 100644 pkgs/development/tools/selenium/remote-control/default.nix diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix deleted file mode 100644 index fbe11ed2bc04..000000000000 --- a/pkgs/development/tools/selenium/remote-control/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, fetchurl, jre }: - -# let version = "1.0-beta-2"; -let version = "1.0-SNAPSHOT-standalone"; - -in stdenv.mkDerivation { - /* - - Use this if there is another release.. - - name = "selenium-remote-control-${version}-dist"; - src = fetchurl { - url = "http://release.seleniumhq.org/selenium-remote-control/${version}/selenium-remote-control-${version}-dist.zip"; - sha256 = "0ciyfqvnv0117l2rhw9dclv85mcf3czpimvybj38v3syl7m7yk41"; - }; - buildInputs = [unzip]; - phases = "unpackPhase buildPhase"; - buildPhase = '' - mkdir -p $out/{bin,lib} - mv * $out/lib - bin="$out/bin/selenium-remote-control" - cat >> "$bin" << EOF - #!/bin/sh - exec ${jre}/bin/java -jar $out/lib/selenium-server-${version}/selenium-server.jar "\$@" - EOF - chmod +x "$bin" - ''; - */ - - # this snapshot version starts a firefox from a script file. It only issues a warning about it - # you still have to pass -DfirefoxDefaultPath=/home/marc/.nix-profile/bin/firefox or such.. - name = "selenium-remote-control-${version}-dist"; - # this dist file has been created using mvn package -Dmaven.test.skip=true based on svn rev 2450 - src = fetchurl { - url = "http://mawercer.de/~nix/selenium-server-1.0-SNAPSHOT-standalone.jar"; - sha256 = "1lqr72a3lmmww1psl19pzp91c9q1dm0314b7y7mz1gnfpwc49y38"; - }; - phases = "buildPhase"; - buildPhase = '' - mkdir -p $out/{bin,lib} - cp $src $out/lib/ - bin="$out/bin/selenium-remote-control" - cat >> "$bin" << EOF - #!/bin/sh - exec ${jre}/bin/java -jar "$out/lib/$(basename $src)" "\$@" - EOF - chmod +x "$bin" - ''; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04aa5e01930e..405c2e7a1554 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6337,11 +6337,6 @@ in sauce-connect = callPackage ../development/tools/sauce-connect { }; - # couldn't find the source yet - seleniumRCBin = callPackage ../development/tools/selenium/remote-control { - jre = jdk; - }; - selenium-server-standalone = callPackage ../development/tools/selenium/server { }; selendroid = callPackage ../development/tools/selenium/selendroid { }; From 67f5e76030a9ac6eaa566e8e6fbfba0824d4db0f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:15:11 -0400 Subject: [PATCH 13/29] felix-remoteshell: 1.0.4 -> 1.1.2 --- pkgs/servers/felix/remoteshell.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix index 6e8089d32e97..3ac3c98718f7 100644 --- a/pkgs/servers/felix/remoteshell.nix +++ b/pkgs/servers/felix/remoteshell.nix @@ -1,14 +1,15 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "apache-felix-remoteshell-bundle-1.0.4"; + version = "1.1.2"; + name = "apache-felix-remoteshell-bundle-${version}"; src = fetchurl { - url = http://apache.proserve.nl/felix/org.apache.felix.shell.remote-1.0.4.jar; - sha256 = "1bgahzs9nnnvfr0yyh9s0r6h1zp2ls6533377rp8r1qk2a4s1gzb"; + url = "http://apache.proserve.nl/felix/org.apache.felix.shell.remote-${version}.jar"; + sha256 = "147zw5ppn98wfl3pr32isyb267xm3gwsvdfdvjr33m9g2v1z69aq"; }; - buildCommand = + buildCommand = '' mkdir -p $out/bundle - cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar + cp ${src} $out/bundle/org.apache.felix.shell.remote-${version}.jar ''; } From f10064be45264491e68b0720a2d651686c79494f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 3 Nov 2016 22:27:09 -0400 Subject: [PATCH 14/29] dxflib: 2.5.0.0-1 -> 3.12.2 --- pkgs/development/libraries/dxflib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index f9c58857731c..832b013123dd 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "2.5.0.0-1"; + version = "3.12.2"; name = "dxflib-${version}"; src = fetchurl { url = "http://www.qcad.org/archives/dxflib/${name}.src.tar.gz"; From e6b054faabf9fc9fe7c5e829ba6c6c16f99bbea7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:32:08 -0400 Subject: [PATCH 15/29] Remove cowsay Sources no longer exist --- pkgs/tools/misc/cowsay/default.nix | 23 ----------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/tools/misc/cowsay/default.nix diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix deleted file mode 100644 index a9bdf1b2b92f..000000000000 --- a/pkgs/tools/misc/cowsay/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, perl }: - -stdenv.mkDerivation { - name = "cowsay-3.03"; - - src = fetchurl { - url = http://www.nog.net/~tony/warez/cowsay-3.03.tar.gz; - sha256 = "1s3c0g5vmsadicc4lrlkmkm8znm4y6wnxd8kyv9xgm676hban1il"; - }; - - buildInputs = [ perl ]; - - installPhase = '' - bash ./install.sh $out - ''; - - meta = { - description = "A program which generates ASCII pictures of a cow with a message"; - homepage = http://www.nog.net/~tony/warez/cowsay.shtml; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.rob ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 405c2e7a1554..affa35f137ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1132,8 +1132,6 @@ in colormake = callPackage ../development/tools/build-managers/colormake { }; - cowsay = callPackage ../tools/misc/cowsay { }; - cpuminer = callPackage ../tools/misc/cpuminer { }; cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; From b054276eb48414059302421e0c0cc5b2444cbfc8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:36:57 -0400 Subject: [PATCH 16/29] qjson: Moved to GitHub --- pkgs/development/libraries/qjson/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index e69ae5f98f7b..1d4da00bf4cf 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, cmake, qt4 }: +{ stdenv, fetchFromGitHub, cmake, qt4 }: stdenv.mkDerivation rec { - name = "qjson-0.8.1"; + version = "0.8.1"; + name = "qjson-${version}"; - src = fetchurl { - url = "mirror://sourceforge/qjson/${name}.tar.bz2"; - sha256 = "1n8lr2ph08yhcgimf4q1pnkd4z15v895bsf3m68ljz14aswvakfd"; + src = fetchFromGitHub { + owner = "flavio"; + repo = "qjson"; + rev = "${version}"; + sha256 = "1rb3ydrhyd4bczqzfv0kqpi2mx4hlpq1k8jvnwpcmvyaypqpqg59"; }; buildInputs = [ cmake qt4 ]; From 893bfb1a1bca99ff0d6ed47804f6f8d841442edf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:41:01 -0400 Subject: [PATCH 17/29] Remove fuse-zip Original sources have moved to BitBucket but clearly this is not used by anybody --- pkgs/tools/filesystems/fuse-zip/default.nix | 23 ------------------- pkgs/tools/filesystems/fuse-zip/libzip.patch | 24 -------------------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 50 deletions(-) delete mode 100644 pkgs/tools/filesystems/fuse-zip/default.nix delete mode 100644 pkgs/tools/filesystems/fuse-zip/libzip.patch diff --git a/pkgs/tools/filesystems/fuse-zip/default.nix b/pkgs/tools/filesystems/fuse-zip/default.nix deleted file mode 100644 index a5ac74fe47a5..000000000000 --- a/pkgs/tools/filesystems/fuse-zip/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, fuse, libzip, zlib }: - -stdenv.mkDerivation rec { - name = "fuse-zip-0.2.13"; - - src = fetchurl { - url = "http://fuse-zip.googlecode.com/files/${name}.tar.gz"; - sha1 = "9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b"; - }; - - patches = [ ./libzip.patch ]; # problems with new libzip; from Gentoo - - buildInputs = [ pkgconfig fuse libzip zlib ]; - - makeFlags = "INSTALLPREFIX=$(out)"; - - meta = { - homepage = http://code.google.com/p/fuse-zip/; - description = "A FUSE-based filesystem that allows read and write access to ZIP files"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/filesystems/fuse-zip/libzip.patch b/pkgs/tools/filesystems/fuse-zip/libzip.patch deleted file mode 100644 index f2348e5f1bab..000000000000 --- a/pkgs/tools/filesystems/fuse-zip/libzip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru fuse-zip-0.2.13/lib/bigBuffer.cpp fuse-zip-0.2.13.new//lib/bigBuffer.cpp ---- fuse-zip-0.2.13/lib/bigBuffer.cpp 2010-12-06 12:34:32.000000000 -0500 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.cpp 2011-09-28 21:40:01.294946957 -0400 -@@ -236,7 +236,7 @@ - len = offset; - } - --ssize_t BigBuffer::zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd) { -+zip_int64_t BigBuffer::zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd) { - CallBackStruct *b = (CallBackStruct*)state; - switch (cmd) { - case ZIP_SOURCE_OPEN: { -diff -ru fuse-zip-0.2.13/lib/bigBuffer.h fuse-zip-0.2.13.new//lib/bigBuffer.h ---- fuse-zip-0.2.13/lib/bigBuffer.h 2010-12-06 12:34:32.000000000 -0500 -+++ fuse-zip-0.2.13.new//lib/bigBuffer.h 2011-09-28 21:40:23.203719133 -0400 -@@ -52,7 +52,7 @@ - * never called because read() always successfull. - * See zip_source_function(3) for details. - */ -- static ssize_t zipUserFunctionCallback(void *state, void *data, size_t len, enum zip_source_cmd cmd); -+ static zip_int64_t zipUserFunctionCallback(void *state, void *data, zip_uint64_t len, enum zip_source_cmd cmd); - - /** - * Return number of chunks needed to keep 'offset' bytes. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c328f74729e0..b825c1132450 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -47,7 +47,6 @@ doNotDisplayTwice rec { firefoxWrapper = firefox; # 2015-09 foomatic_filters = foomatic-filters; # 2016-08 fuse_exfat = exfat; # 2015-09-11 - fuse_zip = fuse-zip; # added 2016-04-27 gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 googleAuthenticator = google-authenticator; # added 2016-10-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index affa35f137ec..eb784fa0bc71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1720,8 +1720,6 @@ in fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; - fuse-zip = callPackage ../tools/filesystems/fuse-zip { }; - exfat = callPackage ../tools/filesystems/exfat { }; dos2unix = callPackage ../tools/text/dos2unix { }; From 82bdd012447dedf661bf36c006e429da0adfbce1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 09:56:19 -0400 Subject: [PATCH 18/29] Remove iksemel Sources no longer exist --- .../development/libraries/iksemel/default.nix | 24 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/iksemel/default.nix diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix deleted file mode 100644 index 7e8061ee8bb1..000000000000 --- a/pkgs/development/libraries/iksemel/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnutls, zlib }: - -stdenv.mkDerivation rec { - name = "iksemel-${version}"; - version = "1.4"; - - src = fetchurl { - url = "https://iksemel.googlecode.com/files/${name}.tar.gz"; - sha1 = "722910b99ce794fd3f6f0e5f33fa804732cf46db"; - }; - - preConfigure = '' - sed -i -e '/if.*gnutls_check_version/,/return 1;/c return 0;' configure - export LIBGNUTLS_CONFIG="${pkgconfig}/bin/pkg-config gnutls" - ''; - - buildInputs = [ pkgconfig gnutls zlib ]; - - meta = { - homepage = "https://code.google.com/p/iksemel/"; - license = stdenv.lib.licenses.lgpl21Plus; - description = "Fast and portable XML parser and Jabber protocol library"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb784fa0bc71..485efed5a517 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7353,8 +7353,6 @@ in id3lib = callPackage ../development/libraries/id3lib { }; - iksemel = callPackage ../development/libraries/iksemel { }; - ilbc = callPackage ../development/libraries/ilbc { }; ilixi = callPackage ../development/libraries/ilixi { }; From 1368ff89a0b5e832a1d7b2cda4f5a4ad1fda2587 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:14:00 -0400 Subject: [PATCH 19/29] remake: 3.82 -> 4.1 --- pkgs/development/tools/build-managers/remake/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 676354a6e8d3..7a199cc925a7 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -2,11 +2,13 @@ stdenv.mkDerivation rec { name = "remake-${version}"; - version = "3.82+dbg-0.6"; + remakeVersion = "4.1"; + dbgVersion = "1.1"; + version = "${remakeVersion}+dbg-${dbgVersion}"; src = fetchurl { - url = "mirror://sourceforge/project/bashdb/remake/${version}/${name}.tar.bz2"; - sha256 = "0i2g6vi9zya78d9zpigfnmzg2qcl93myjfibh3kfmjk7b9lajfyz"; + url = "mirror://sourceforge/project/bashdb/remake/${version}/remake-${remakeVersion}+dbg${dbgVersion}.tar.bz2"; + sha256 = "1zi16pl7sqn1aa8b7zqm9qnd9vjqyfywqm8s6iap4clf86l7kss2"; }; buildInputs = [ readline ]; From c431c392333f949622cf1a12df9386cdf0fd84b1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:23:38 -0400 Subject: [PATCH 20/29] siproxd: 0.8.1 -> 0.8.2 --- pkgs/applications/networking/siproxd/cheaders.patch | 5 +++-- pkgs/applications/networking/siproxd/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/siproxd/cheaders.patch b/pkgs/applications/networking/siproxd/cheaders.patch index 53c4813cc335..69a3e3287371 100644 --- a/pkgs/applications/networking/siproxd/cheaders.patch +++ b/pkgs/applications/networking/siproxd/cheaders.patch @@ -3,11 +3,12 @@ index 1904ab3..cb3624d 100644 --- a/src/dejitter.c +++ b/src/dejitter.c @@ -22,6 +22,8 @@ - + #include - + +#include +#include + #include #include #include #include diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 69ebab78f947..14ed2587e636 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libosip }: stdenv.mkDerivation rec { - name = "siproxd-0.8.1"; - + name = "siproxd-0.8.2"; + src = fetchurl { url = "mirror://sourceforge/siproxd/${name}.tar.gz"; - sha256 = "1bcxl0h5nc28m8lcdhpbl5yc93w98xm53mfzrf04knsvmx7z0bfz"; + sha256 = "1l6cyxxhra825jiiw9npa7jrbfgbyfpk4966cqkrw66cn28y8v2j"; }; patches = [ ./cheaders.patch ]; From 628531a783f2b466348a833cfdad7808b608b74c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:24:44 -0400 Subject: [PATCH 21/29] Remove minmay Sources no longer exist --- pkgs/development/libraries/minmay/default.nix | 19 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/libraries/minmay/default.nix diff --git a/pkgs/development/libraries/minmay/default.nix b/pkgs/development/libraries/minmay/default.nix deleted file mode 100644 index 4518b4dd760b..000000000000 --- a/pkgs/development/libraries/minmay/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, cmake, openssl }: - -stdenv.mkDerivation rec { - name = "minmay-${version}"; - version = "1.0.0"; - - src = fetchurl { - url = "https://github.com/mazhe/minmay/archive/1.0.0.tar.gz"; - sha256 = "1amycxvhbd0lv6j5zsvxiwrx29jvndcy856j3b3bisys24h95zw2"; - }; - - buildInputs = [ cmake openssl ]; - - meta = { - homepage = "https://github.com/mazhe/minmay"; - license = stdenv.lib.licenses.lgpl21Plus; - description = "An XMPP library (forked from the iksemel project)"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 485efed5a517..62d605e2728b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8469,8 +8469,6 @@ in minizip = callPackage ../development/libraries/minizip { }; - minmay = callPackage ../development/libraries/minmay { }; - miro = callPackage ../applications/video/miro { avahi = avahi.override { withLibdnssdCompat = true; From 7329435fabee51840edbf2435b250a8dd5107eb0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 10:27:01 -0400 Subject: [PATCH 22/29] Remove jing No longer exists --- pkgs/tools/text/xml/jing/default.nix | 22 ---------------------- pkgs/tools/text/xml/jing/unzip-builder.sh | 14 -------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 38 deletions(-) delete mode 100644 pkgs/tools/text/xml/jing/default.nix delete mode 100755 pkgs/tools/text/xml/jing/unzip-builder.sh diff --git a/pkgs/tools/text/xml/jing/default.nix b/pkgs/tools/text/xml/jing/default.nix deleted file mode 100644 index 5737fff14f5d..000000000000 --- a/pkgs/tools/text/xml/jing/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, unzip, jre }: - -stdenv.mkDerivation { - name = "jing-20091111"; - builder = ./unzip-builder.sh; - - src = fetchurl { - url = https://jing-trang.googlecode.com/files/jing-20091111.zip; - sha256 = "134h2r22r64v5yk4v8mhl6r893dlw5vzx9daf2sj2mbbma004sap"; - }; - - inherit unzip jre; - - meta = with stdenv.lib; { - description = "A RELAX NG validator in Java"; - # The homepage is www.thaiopensource.com, but it links to googlecode.com - # for downloads and call it the "project site". - homepage = http://www.thaiopensource.com/relaxng/jing.html; - platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; - }; -} diff --git a/pkgs/tools/text/xml/jing/unzip-builder.sh b/pkgs/tools/text/xml/jing/unzip-builder.sh deleted file mode 100755 index c02920e5a69b..000000000000 --- a/pkgs/tools/text/xml/jing/unzip-builder.sh +++ /dev/null @@ -1,14 +0,0 @@ -set -e -source $stdenv/setup - -$unzip/bin/unzip $src -mkdir -p $out -mv $name/* $out - -cat > "$out/bin/jing" < Date: Fri, 4 Nov 2016 10:54:09 -0400 Subject: [PATCH 23/29] Remove trang Source no longer exists --- pkgs/tools/text/xml/trang/builder.sh | 15 --------------- pkgs/tools/text/xml/trang/default.nix | 24 ------------------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 41 deletions(-) delete mode 100644 pkgs/tools/text/xml/trang/builder.sh delete mode 100644 pkgs/tools/text/xml/trang/default.nix diff --git a/pkgs/tools/text/xml/trang/builder.sh b/pkgs/tools/text/xml/trang/builder.sh deleted file mode 100644 index 9fe712360bab..000000000000 --- a/pkgs/tools/text/xml/trang/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/jars -unzip -j $src '*/trang.jar' -cp -p *.jar $out/jars - -mkdir -p $out/bin - -cat >> $out/bin/trang < Date: Fri, 4 Nov 2016 11:10:21 -0400 Subject: [PATCH 24/29] gsoap: 2.8.16 -> 2.8.37 --- pkgs/development/libraries/gsoap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index d1140319611d..bf1d29dae0e8 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "2.8.16"; + version = "2.8.37"; src = fetchurl { - url = "mirror://sourceforge/project/gsoap2/gSOAP/gsoap_${version}.zip"; - sha256 = "00lhhysa9f9ychkvn1ij0ngr54l1dl9ww801yrliwq5c05gql7a6"; + url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip"; + sha256 = "1nvf5hgwff1agqdzbn3qc5569jzm14qkwqws0673z6hv2l3lijx3"; }; buildInputs = [ unzip m4 bison flex openssl zlib ]; From cc7c28332b3d795c7a806024f051317795bd1b9d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:18:52 -0400 Subject: [PATCH 25/29] Remove ttysnoop No longer exists --- pkgs/os-specific/linux/ttysnoop/default.nix | 38 ------------------- .../linux/ttysnoop/default.upstream | 3 -- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/ttysnoop/default.nix delete mode 100644 pkgs/os-specific/linux/ttysnoop/default.upstream diff --git a/pkgs/os-specific/linux/ttysnoop/default.nix b/pkgs/os-specific/linux/ttysnoop/default.nix deleted file mode 100644 index 670c96083443..000000000000 --- a/pkgs/os-specific/linux/ttysnoop/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchurl}: -let - s = # Generated upstream information - rec { - baseName="ttysnoop"; - version="0.12d.k26"; - name="${baseName}-${version}"; - hash="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395"; - url="http://sysd.org/stas/files/active/0/ttysnoop-0.12d.k26.tar.gz"; - sha256="0jb2zchaiqmmickj0la7wjw3sf9vy65qfhhs11yrzx4mmwkp0395"; - }; - buildInputs = [ - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - preBuild = '' - sed -e "s@/sbin@$out/sbin@g" -i Makefile - sed -e "s@/usr/man@$out/share/man@g" -i Makefile - mkdir -p "$out/share/man/man8" - mkdir -p "$out/sbin" - ''; - postInstall = '' - mkdir -p "$out/etc" - cp snooptab.dist "$out/etc/snooptab" - ''; - meta = { - inherit (s) version; - description = "A tool to clone input and output of another tty/pty to the current one"; - license = stdenv.lib.licenses.gpl2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/ttysnoop/default.upstream b/pkgs/os-specific/linux/ttysnoop/default.upstream deleted file mode 100644 index 905a639c31e7..000000000000 --- a/pkgs/os-specific/linux/ttysnoop/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://sysd.org/stas/node/35 -ensure_choice -version '.*-([0-9a-z.]+)[.]tar[.].*' '\1' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f49dae92bfe..8984fa925e54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3920,8 +3920,6 @@ in ttyrec = callPackage ../tools/misc/ttyrec { }; - ttysnoop = callPackage ../os-specific/linux/ttysnoop {}; - ttylog = callPackage ../tools/misc/ttylog { }; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; From 1120f2a2b7192bb823da8fde27d24300c12d3c41 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:23:43 -0400 Subject: [PATCH 26/29] xc3sprog: 748 -> 787 --- pkgs/development/tools/misc/xc3sprog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 52471c30fd07..8f3f6c1b22a7 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -4,12 +4,12 @@ # prebuilt binary subversion snapshots on sourceforge. stdenv.mkDerivation rec { - version = "748"; # latest @ 2013-10-26 + version = "787"; name = "xc3sprog-${version}"; src = fetchsvn rec { url = "https://svn.code.sf.net/p/xc3sprog/code/trunk"; - sha256 = "0wkz6094kkqz91qpa24pzlbhndc47sjmqhwk3p7ccabv0041rzk0"; + sha256 = "1rfhms3i7375kdlg0sdg5k52ix3xv5llj2dr30vamyg7pk74y8rx"; rev = "${version}"; }; From 198a69fcb76a7e2f578399c6e81985c6dafdf154 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:29:22 -0400 Subject: [PATCH 27/29] tintin: 2.00.9 -> 2.01.1 --- pkgs/games/tintin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index c2bc9d37b4f6..deb283c57c40 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, pcre }: stdenv.mkDerivation rec { - name = "tintin-2.00.9"; + name = "tintin-2.01.1"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "0x8jakxx7hh7b0z6vjcxyrda0afbz2s2yy7mvrbxjffyc2dyxzna"; + sha256 = "195wrfcys8yy953gdrl1gxryhjnx9lg1vqgxm3dyzm8bi18aa2yc"; }; buildInputs = [ zlib pcre ]; From 3bb889c34bb3f3a11c9116b33123d1765d375284 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 11:30:17 -0400 Subject: [PATCH 28/29] Remove g500-control Sources no longer available --- pkgs/tools/misc/g500-control/default.nix | 34 ------------------------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 36 deletions(-) delete mode 100644 pkgs/tools/misc/g500-control/default.nix diff --git a/pkgs/tools/misc/g500-control/default.nix b/pkgs/tools/misc/g500-control/default.nix deleted file mode 100644 index 9d42c7d68d53..000000000000 --- a/pkgs/tools/misc/g500-control/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "g500-control-0.0.1"; - - src = fetchurl { - url = "http://g500-control.googlecode.com/files/g500_control_0.0.1.tar.gz"; - sha256 = "1xlg9lpxnk3228k81y1i6jjh4df1p4jh64g54w969g6a6v6dazvb"; - }; - - unpackPhase = '' - mkdir -p g500-control - tar -C g500-control/ -xf $src - ''; - - buildPhase = '' - cd g500-control - gcc -o g500-control *.c - ''; - - installPhase = '' - mkdir -p $out/bin/ - cp g500-control $out/bin/ - ''; - - meta = { - homepage = http://code.google.com/p/g500-control/; - description = "Configure Logitech G500's internal profile under Linux"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8984fa925e54..6672f3550a4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1726,8 +1726,6 @@ in uni2ascii = callPackage ../tools/text/uni2ascii { }; - g500-control = callPackage ../tools/misc/g500-control { }; - galculator = callPackage ../applications/misc/galculator { gtk = gtk3; }; From 7a372f0be701f8c8dcbeec0eedf5918e69498bf4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 4 Nov 2016 23:04:05 -0400 Subject: [PATCH 29/29] cowsay: init at 3.03+dfsg1-16 --- pkgs/tools/misc/cowsay/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/cowsay/default.nix diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix new file mode 100644 index 000000000000..0a7b079445d5 --- /dev/null +++ b/pkgs/tools/misc/cowsay/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, perl }: + +stdenv.mkDerivation { + name = "cowsay-3.03+dfsg1-16"; + + src = fetchgit { + url = https://anonscm.debian.org/git/collab-maint/cowsay.git; + rev = "acb946c166fa3b9526b9c471ef1330f9f89f9c8b"; + sha256 = "1ji66nrdcc8sh79hwils3nbaj897s352r5wp7kzjwiym8bm2azk6"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + bash ./install.sh $out + ''; + + meta = { + description = "A program which generates ASCII pictures of a cow with a message"; + homepage = http://www.nog.net/~tony/warez/cowsay.shtml; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.rob ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6672f3550a4a..0d918e26b045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -741,6 +741,8 @@ in corosync = callPackage ../servers/corosync { }; + cowsay = callPackage ../tools/misc/cowsay { }; + cherrytree = callPackage ../applications/misc/cherrytree { }; chntpw = callPackage ../tools/security/chntpw { };