diff options
author | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-02-28 16:32:57 +0000 |
commit | 3b4765c9e59a34e7f48d2798cd4c4ef14d72e5a4 (patch) | |
tree | 04c567a4061b3adf6d1e0a898f39b67f27d37aea /pkgs/applications | |
parent | 8615f026a48cbf3f1c37b30e9b70bba6af013a12 (diff) | |
parent | a9d24cedeb3ba97a4e23ff93fadff32280ff0ab6 (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications')
46 files changed, 163 insertions, 71 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix new file mode 100644 index 0000000000000..62fe419792942 --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; + version = "0.11.2.cl1.b1"; + + src = fetchurl { + url = "https://github.com/bitcoinclassic/bitcoinclassic/archive/v${version}.tar.gz"; + sha256 = "1szsnx5aijk3hx7qkqzbqsr0basg8ydwp20mh3bhnf4ljryy2049"; + }; + + buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + miniupnpc utillinux protobuf ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-peer electronic cash system (Classic client)"; + longDescription= '' + Bitcoin is a free open source peer-to-peer electronic cash system that is + completely decentralized, without the need for a central server or trusted + parties. Users hold the crypto keys to their own money and transact directly + with each other, with the help of a P2P network to check for double-spending. + + We call our code repository Bitcoin Classic. It starts as a one-feature patch + to bitcoin-core that increases the blocksize limit to 2 MB. We will have + ports for master and 0.11.2, so that miners and businesses can upgrade to 2 MB + blocks from any recent bitcoin software version they run. In the future we will + continue to release updates that are in line with Satoshi’s whitepaper & + vision, and are agreed upon by the community. + ''; + homepage = "https://bitcoinclassic.com/"; + maintainers = with maintainers; [ jefdaj ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index e6c95729c6ec2..9b86bf2b3d5af 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -6,12 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; - xt_version = "0.11A"; - version = xt_version; + version = "0.11D"; src = fetchurl { - url = "https://github.com/bitcoinxt/bitcoinxt/archive/v0.11A.tar.gz"; - sha256 = "129cbqf6bln6rhdk70c6nfwdjk6afvsaaw4xdyp0pnfand8idz7n"; + url = "https://github.com/bitcoinxt/bitcoinxt/archive/v${version}.tar.gz"; + sha256 = "09r2i88wzqaj6mh66l3ngyfkm1a0dhwm5ibalj6y55wbxm9bvd36"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib @@ -24,12 +23,17 @@ stdenv.mkDerivation rec{ ] ++ optionals withGui [ "--with-gui=qt4" ]; meta = { - description = "Peer-to-peer electronic cash system"; + description = "Peer-to-peer electronic cash system (XT client)"; longDescription= '' - Bitcoin XT is an implementation of a Bitcoin full node, based upon the - source code of Bitcoin Core. It is built by taking the latest stable - Core release, applying a series of patches, and then doing deterministic - builds so anyone can check the downloads correspond to the source code. + Bitcoin is a free open source peer-to-peer electronic cash system that is + completely decentralized, without the need for a central server or trusted + parties. Users hold the crypto keys to their own money and transact directly + with each other, with the help of a P2P network to check for double-spending. + + Bitcoin XT is an implementation of a Bitcoin full node, based upon the + source code of Bitcoin Core. It is built by taking the latest stable + Core release, applying a series of patches, and then doing deterministic + builds so anyone can check the downloads correspond to the source code. ''; homepage = "https://bitcoinxt.software/"; maintainers = with maintainers; [ jefdaj ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index a7daaf3a9eab8..0b0e42699edf0 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -5,6 +5,9 @@ rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; + bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix index c7e282648ad26..c0879e58aca6d 100644 --- a/pkgs/applications/audio/QmidiNet/default.nix +++ b/pkgs/applications/audio/QmidiNet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "qmidinet-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/qmidinet/${name}.tar.gz"; + url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa"; }; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index f44f1a2b78a01..3d44dd872c782 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -15,7 +15,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "4.4"; + tag = "4.7"; in @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Ardour"; repo = "ardour"; - rev = "b00d75adf63db155ef2873bd9d259dc8ca256be6"; - sha256 = "1gnrcnq2ksnh7fsa301v1c4p5dqrbqpjylf02rg3za3ab58wxi7l"; + rev = "d84a8222f2b6dab5028b2586f798535a8766670e"; + sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l"; }; buildInputs = @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; # ardour's wscript has a "tarball" target but that required the git revision - # be available. Since this is an unzipped tarball fetched from github we + # be available. Since this is an unzipped tarball fetched from github we # have to do that ourself. patchPhase = '' printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 0ca3d99ddc61c..ca3148f0e0a4d 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://devel.tlrmx.org/audio/bitmeter/; - description = "Also known as jack bitscope. Useful to detect denormals."; + description = "Also known as jack bitscope. Useful to detect denormals"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 5d5b70a589857..e2adf9e131c7e 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "eq10q-2-${version}"; version = "beta7.1"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/eq10q/${name}.tar.gz"; + url = "mirror://sourceforge/project/eq10q/${name}.tar.gz"; sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi"; }; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 4e03b26c036c3..56f7ac50227ef 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -12,7 +12,7 @@ let version = "0.9.73"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.tgz"; + url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5"; }; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 91e9fb66659e4..4759f228e3588 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -19,7 +19,7 @@ let version = "2.0-a41"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/faudiostream/faust-2.0.a41.tgz"; + url = "mirror://sourceforge/project/faudiostream/faust-2.0.a41.tgz"; sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm"; }; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 9f023f34291d3..f08de9d080a2a 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "gjay-0.3.2"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/gjay/gjay-0.3.2.tar.gz"; + url = "mirror://sourceforge/project/gjay/gjay-0.3.2.tar.gz"; sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8"; }; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 0b2e4e7977b8a..4d79c3ebecfa7 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "kid3-${meta.version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/kid3/kid3/${meta.version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/kid3/kid3/${meta.version}/${name}.tar.gz"; sha256 = "12sa54mg1b3wkagmh5yi20ski8km9d199lk0a1yfxy0ffjfld7js"; }; diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index 3fef8398e9c92..907d4b8be1684 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mp3gain-1.5.2"; src = fetchurl { - url = "http://downloads.sourceforge.net/mp3gain/mp3gain-1_5_2-src.zip"; + url = "mirror://sourceforge/mp3gain/mp3gain-1_5_2-src.zip"; sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv"; }; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 721ef89515ed7..460745ddddb85 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1-alpha55"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz"; + url = "mirror://sourceforge/project/pure-data/libraries/cyclone/${name}.tar.gz"; sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i"; }; diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 9968b5fe0ed44..1eb0e1be65477 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.5.5"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz"; + url = "mirror://sourceforge/project/pure-data/libraries/maxlib/${name}.tar.gz"; sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w"; }; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index f98f7862475fb..39c0d579e8149 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ]; src = - if builtins.currentSystem == "x86_64-linux" then + if stdenv.system == "x86_64-linux" then if demo then fetchurl { url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { name = "rns_3_0_1_linux_x86_64.tar.gz"; sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd"; } - else if builtins.currentSystem == "i686-linux" then + else if stdenv.system == "i686-linux" then if demo then fetchurl { url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2"; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 5d60824c3b0d4..9cc7f3f1fc85d 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk -, libjack2, libsndfile, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.3.7.1"; + version = "1.3.8.2"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "13xc1x8jrr2rn26jx4dini692ww3771d5j5xf7f56ixqr7mmdhvz"; + sha256 = "0wl4ln6v1nkkx56kfah23chyrhga2vi93i82g0s200c4s4184xr8"; }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile readline lv2 mesa + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa minixml zlib xorg.libpthreadstubs ]; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 558c9fa3de5f7..074a622667fa5 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jre, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct) makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ - --prefix PATH : ${jre}/bin \ + --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 815e092c9d5ba..62271998060f2 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk, libXtst, jre +, glib, gtk, libXtst, jdk , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix index d377e5cb36f67..69ba674d2d49d 100644 --- a/pkgs/applications/editors/heme/default.nix +++ b/pkgs/applications/editors/heme/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "heme-${version}"; version = "0.4.2"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; + url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz"; sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v"; }; postPatch = '' diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 200d091b64a0b..b7b4d299efcc1 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; src = fetchurl { - url = "http://downloads.sourceforge.net/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.2/saga-2.2.2.tar.gz"; + url = "mirror://sourceforge/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.2/saga-2.2.2.tar.gz"; sha256 = "031cd70b7ec248f32f955a9316aefc7f7ab283c5129c49aa4bd748717d20357e"; }; diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index 17bf7d5467095..5ab7d4d8a6945 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -2,7 +2,7 @@ let - version = "0.9.11"; + version = "0.9.12"; in @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { name = "pythonmagick-${version}"; src = fetchurl { - url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.gz"; - sha256 = "01z01mlqkk0lvrh2jsmf84qjw29sq4rpj0653x7nqy7mrszwwp2v"; + url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz"; + sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b"; }; buildInputs = [python boost pkgconfig imagemagick]; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index f54628e0b8ded..e130b23a8aaae 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }: stdenv.mkDerivation rec { name = "apitrace-${version}"; @@ -11,13 +11,11 @@ stdenv.mkDerivation rec { owner = "apitrace"; }; - buildInputs = [ libX11 procps python qtbase ]; - nativeBuildInputs = [ cmake ]; + # LD_PRELOAD wrappers need to be statically linked to work against all kinds + # of games -- so it's fine to use e.g. bundled snappy. + buildInputs = [ libX11 procps python libdwarf qtbase qtwebkit ]; - buildPhase = '' - cmake - make - ''; + nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { homepage = https://apitrace.github.io; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index cd3a09887d0f9..cc456465ba63e 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2; sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; }; - + nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; buildInputs = [ wxGTK gtk libxml2 freetype pango ]; @@ -17,4 +17,6 @@ stdenv.mkDerivation { patches = map fetchurl (import ./debian-patches.nix); prePatch = "patchShebangs Scripts"; + + meta.broken = true; } diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix index 2b92dc8d19e98..e77dd0e8c8a4a 100644 --- a/pkgs/applications/misc/chirp/default.nix +++ b/pkgs/applications/misc/chirp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A free, open-source tool for programming your amateur radio."; + description = "A free, open-source tool for programming your amateur radio"; homepage = http://chirp.danplanet.com/; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 50ae2b2d15f6b..96b4296911553 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Devilspie2 is a window matching utility."; + description = "Devilspie2 is a window matching utility"; longDescription = '' Devilspie2 is a window matching utility, allowing the user to perform scripted actions on windows as they are created. For diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 51a48db34e914..0341ffc64af82 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway."; + description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; # On the page: This page will be disappearing on October 8, 2015. homepage = https://home.comcast.net/~wb2osz/site/; license = licenses.gpl2; diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 5dcee439ef91f..5d5f83a2370fa 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "2.1.3"; src = fetchurl { - url = "http://downloads.sourceforge.net/galculator/${name}.tar.gz"; + url = "mirror://sourceforge/galculator/${name}.tar.gz"; sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17"; }; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 1a46b7c7afb28..e03d4b397daaa 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://csl.name/jp2a/; - description = "A small utility that converts JPG images to ASCII."; + description = "A small utility that converts JPG images to ASCII"; license = licenses.gpl2; }; } diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix index 8db606fd6d59d..b6e59613b3cca 100644 --- a/pkgs/applications/misc/lxappearance/default.nix +++ b/pkgs/applications/misc/lxappearance/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "lxappearance-0.6.1"; src = fetchurl{ - url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz"; + url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9"; }; buildInputs = [ intltool libX11 pkgconfig gtk ]; diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix index 794746653f753..f9aa567ed4b5d 100644 --- a/pkgs/applications/misc/multimon-ng/default.nix +++ b/pkgs/applications/misc/multimon-ng/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Multimon is a digital baseband audio protocol decoder."; + description = "Multimon is a digital baseband audio protocol decoder"; longDescription = '' multimon-ng a fork of multimon, a digital baseband audio protocol decoder for common signaling modes in commercial and diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index 90737a344ca2e..3c9bdcada15d9 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "quicksynergy-${version}"; version = "0.9.0"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; + url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz"; sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; }; buildInputs = [ diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 60322c2b911e9..ad7de90cad631 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "roxterm-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/roxterm/${name}.tar.bz2"; + url = "mirror://sourceforge/roxterm/${name}.tar.bz2"; sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x"; }; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 5904a2a5ffd31..a62f7cd2aa662 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.2.4"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/vym/${version}/${name}.tar.bz2"; + url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2"; sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs"; }; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index dbc5e84e67bc0..a9f786a2a084c 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { version = "4.0.3-20150806"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz"; + url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz"; sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv"; }; diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix index 9b16404b6208d..a50779f53dd0c 100644 --- a/pkgs/applications/networking/instant-messengers/choqok/default.nix +++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { name = "${pn}-${v}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/choqok/Choqok/choqok-1.5.tar.xz"; + url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz"; sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4"; }; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 32f77cfa2c220..093e7a22b921d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "38.3.0"; in +let version = "38.6.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 43c5e0fb627f9..1a5cf987fd8ca 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -106,6 +106,9 @@ in stdenv.mkDerivation rec { patchShebangs . # It is used only as an indicator of the proper current directory touch solenv/inc/target.mk + + # BLFS patch for Glibc 2.23 renaming isnan + sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx ''; # fetch_Download_item tries to interpret the name as a variable name diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix index 09af2d708c965..7726793fcaf83 100644 --- a/pkgs/applications/science/math/lp_solve/default.nix +++ b/pkgs/applications/science/math/lp_solve/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver."; + description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver"; homepage = "http://lpsolve.sourceforge.net"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 6cde64b309007..49e1734fe02d0 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "0.11.2"; + version = "0.12"; src = fetchurl { url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if"; + sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif"; }; # cgit is tightly coupled with git and needs a git source tree to build. @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to # 1.9.2 (see the repository history) gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz"; - sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq"; + url = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz"; + sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index 5cca8ebef3c7d..f61f9fe6d2af6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/michaeldfallen/git-radar; license = licenses.mit; - description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo."; + description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo"; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 4e440d4bc6ab2..56d8b334e8e92 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -2,12 +2,12 @@ buildPythonApplication rec { name = "gitinspector-${version}"; - version = "0.4.1"; + version = "0.4.4"; namePrefix = ""; src = fetchzip { url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz"; - sha256 = "07kjvf9cj6g6gvjgnnas5facm3nhxppf0l0fcxyd4vq6xhdb3swp"; + sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m"; name = name + "-src"; }; diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix new file mode 100644 index 0000000000000..64b6e2107f6a1 --- /dev/null +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }: + +stdenv.mkDerivation rec { + name = "gitstats-${version}"; + version = "2016-01-08"; + + # upstream does not make releases + src = fetchzip { + url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip"; + sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59"; + name = name + "-src"; + }; + + buildInputs = [ perl python ]; + + postPatch = '' + sed -e "s|gnuplot_cmd = .*|gnuplot_cmd = '${gnuplot}/bin/gnuplot'|" \ + -e "s|\<wc\>|${coreutils}/bin/wc|g" \ + -e "s|\<grep\>|${gnugrep}/bin/grep|g" \ + -i gitstats + ''; + + buildPhase = '' + make man VERSION="${version}" + ''; + + installPhase = '' + make install PREFIX="$out" VERSION="${version}" + install -Dm644 doc/gitstats.1 "$out"/share/man/man1/gitstats.1 + ''; + + meta = with stdenv.lib; { + homepage = http://gitstats.sourceforge.net/; + description = "Git history statistics generator"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 561ab15168218..24e99d78c4865 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/wxcam/wxcam/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz"; sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859"; }; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index f5740dda4e9bb..705691b168261 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = "2.6.8"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz"; sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r"; }; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 77903aa958975..9301f886472ce 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "2.4.1"; + version = "2.5.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "0xx1wc7lj5m3r2ab7f0axlfknszvbd8rlclpqz4jk48zid6czmg3"; + sha256 = "1m3j6xl7msrniidkvr5pw9d44yba5m7hm42xz8xy77v105s8hhrl"; }; buildInputs = diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index 466c5b7ec6fb0..c3880b92bdf8a 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=\${out} VERSION=${version}"; meta = with stdenv.lib; { - description = "A flexible scheduler for your i3bar blocks."; + description = "A flexible scheduler for your i3bar blocks"; homepage = https://github.com/vivien/i3blocks; license = licenses.gpl3; maintainers = [ "MindTooth" ]; |