From f5f039eeb4b3a707bed82b3abecd16779e7c2bf5 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 4 Oct 2015 22:13:50 +0100 Subject: [PATCH 01/26] apache-httpd: harden default SSL cipher list A couple of tweaks on the SSL cipher list. Disabled RC4 which is now considered broken. https://community.qualys.com/blogs/securitylabs/2013/03/19/rc4-in-tls-is-broken-now-what Enabled Forward Secrecy for modern browsers. https://en.wikipedia.org/wiki/Forward_secrecy Without the change, NixOS servers are capped at Grade B on https://www.ssllabs.com/ssltest/index.html --- nixos/modules/services/web-servers/apache-httpd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 7350a6a68c70..2b0bb0c38734 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -173,7 +173,8 @@ let SSLRandomSeed connect builtin SSLProtocol All -SSLv2 -SSLv3 - SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP + SSLCipherSuite HIGH:!aNULL:!MD5:!EXP + SSLHonorCipherOrder on ''; From 8b644c5826f9e0c62f84fa7844e369fca9a41a96 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 16 Feb 2016 21:55:25 +1100 Subject: [PATCH 02/26] rust: fix prePatch phase fail when sourceRoot set We want to go up more than a single directory if we're in a nested one. --- pkgs/build-support/rust/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index e0d451417780..79e4366eebe1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation (args // { ( set -euo pipefail - cd ../deps/registry/src/* + cd $NIX_BUILD_TOP/deps/registry/src/* for script in $patchRegistryDeps/*; do # Run in a subshell so that directory changes and shell options don't From 93328bbd6241c42b04c75c4be9a6c16033499104 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 16 Feb 2016 21:54:53 +1100 Subject: [PATCH 03/26] pijul: 0.2-6ab9ba Maintainer has been working with us, this commit was given by them. --- .../version-management/pijul/default.nix | 28 ++++-- .../pijul/pijul.org.context | 92 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 pkgs/applications/version-management/pijul/pijul.org.context diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index f00e22bb385c..399e4cf30244 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchdarcs, ocaml, findlib, cryptokit, yojson, lmdb, zlib }: +{ stdenv, fetchdarcs, rustUnstable, openssl, libssh }: -stdenv.mkDerivation rec { +with rustUnstable; + +buildRustPackage rec { name = "pijul-${version}"; - version = "0.1"; + version = "0.2-6ab9ba"; src = fetchdarcs { url = "http://pijul.org/"; - rev = version; - sha256 = "0r189xx900w4smq6nyy1wnrjf9sgqrqw5as0l7k6gq0ra36szzff"; + context = ./pijul.org.context; + sha256 = "1cgkcr5wdkwj7s0rda90bfchbwmchgi60w5d637894w20hkplsr4"; }; - buildInputs = [ ocaml findlib cryptokit yojson lmdb zlib ]; + sourceRoot = "fetchdarcs/pijul"; - installPhase = '' - mkdir -p $out/bin - cp pijul $out/bin/ + depsSha256 = "110bj2lava1xs75z6k34aip7zb7rcmnxk5hmiyi32i9hs0ddsdrz"; + + cargoUpdateHook = '' + cp -r ../libpijul src/ ''; + setSourceRoot = '' + chmod -R u+w "$sourceRoot" + cp -r "$sourceRoot"/../libpijul "$sourceRoot"/src/ + ''; + + buildInputs = [ openssl libssh ]; + meta = with stdenv.lib; { homepage = https://pijul.org/; description = "Fast DVCS based on a categorical theory of patches"; diff --git a/pkgs/applications/version-management/pijul/pijul.org.context b/pkgs/applications/version-management/pijul/pijul.org.context new file mode 100644 index 000000000000..03a3f0f9a7c1 --- /dev/null +++ b/pkgs/applications/version-management/pijul/pijul.org.context @@ -0,0 +1,92 @@ + +Context: + +[+libpijul/Cargo.lock +pe@pijul.org**20160212063509 + Ignore-this: e5a696b13850b36668a41aedb7bd1b74 +] + +[+pijul/Cargo.lock +pe@pijul.org**20160212063451 + Ignore-this: a621a502d1701cb63e6b5c8fd0afbde8 +] + +[Error detection, gnupg messages +pe@pijul.org**20160210101417 + Ignore-this: 3c517e122c1eca1df9520aed8fd3b0ea +] + +[Login command +pe@pijul.org**20160210055826 + Ignore-this: 7be5618dc418554a82c5f8a68cc8f515 +] + +[Extra functions for the nest +pe@pijul.org**20160208205519 + Ignore-this: 39c8cbed5517b31bc846493e6ffefc76 +] + +[Timestamp in RFC3339 +pe@pijul.org**20160208145551 + Ignore-this: dd114fe418052570572d73e443683d85 +] + +[Combined external_hash and contents in libpijul (makes it easier to print patches) +pe@pijul.org**20160208145450 + Ignore-this: 69f588e1bab551bffd719fa05ad7080a +] + +[disentangle output in libpijul +florent.becker@ens-lyon.org**20160208094544 + Ignore-this: 2dc35255cf48d77eb0c4ba2dde6d4f98 +] + +[Disentangle libpijul::Repository::local_diff +florent.becker@ens-lyon.org**20160207104631 + Ignore-this: 65b119358afa95eb013e84c0d7a250d9 +] + +[remove redundant import +florent.becker@ens-lyon.org**20160207104613 + Ignore-this: e3f7873ec678f62f4129be61238c2c0d +] + +[Disentangle add_lines and delete_lines in diff +florent.becker@ens-lyon.org**20160207102456 + Ignore-this: 5e89908adf7a519bbe2b2ab399cf0a2 +] + +[Disentangle libpijul::rec_delete +florent.becker@ens-lyon.org**20160206214730 + Ignore-this: fb6a70c298a38724665c3d6452577649 +] + +[Make InternalKey type be an array rather than a reference +florent.becker@ens-lyon.org**20160205195638 + Ignore-this: f9b5d15049358b2d8e93322d25a50e58 +] + +[Ask ssh known_hosts, and new file format +pe@pijul.org**20160207120834 + Ignore-this: f7a7f2ae672a3f6f40a2ac85139d6e10 +] + +[Handling HTTP errors (when cloning from HTTP) +pe@pijul.org**20160204182444 + Ignore-this: 1805ae8d3b8a4ca49da06e18dd37b151 +] + +[Small debugging assertions +pe@pijul.org**20160203143007 + Ignore-this: e3d3dddc72511166d606e1751b19411b +] + +[Two unused functions back (used in the nest) +pe@pijul.org**20160202075743 + Ignore-this: 8c6904b122c8a78bfa0b9cc5416c943 +] + +[TAG 0.2 +pe@pijul.org**20160202073939 + Ignore-this: 1e9d04d5ffe231ffaccaf9c4ccb684d3 +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fae36c212c6e..11dc91aef810 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12862,9 +12862,7 @@ let pig = callPackage ../applications/networking/cluster/pig { }; - pijul = callPackage ../applications/version-management/pijul { - inherit (ocamlPackages) findlib cryptokit yojson; - }; + pijul = callPackage ../applications/version-management/pijul { }; playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; From cb8ac5742d87cb566996c1b4e8f4f2cc21f604ee Mon Sep 17 00:00:00 2001 From: "Rommel M. Martinez" Date: Sat, 20 Feb 2016 01:30:54 +0800 Subject: [PATCH 04/26] ugarit-manifest-maker: init at 0.1 --- .../backup/ugarit-manifest-maker/default.nix | 31 ++ .../backup/ugarit-manifest-maker/eggs.nix | 431 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 464 insertions(+) create mode 100644 pkgs/tools/backup/ugarit-manifest-maker/default.nix create mode 100644 pkgs/tools/backup/ugarit-manifest-maker/eggs.nix diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix new file mode 100644 index 000000000000..00651806a10a --- /dev/null +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -0,0 +1,31 @@ +{ pkgs, stdenv, eggDerivation, fetchegg }: +let + eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; }; +in with pkgs; eggDerivation rec { + pname = "ugarit-manifest-maker"; + version = "0.1"; + name = "${pname}-${version}"; + + src = fetchegg { + inherit version; + name = pname; + sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q"; + }; + + buildInputs = with eggs; [ + matchable + srfi-37 + fnmatch + miscmacros + ugarit + numbers + ]; + + meta = with stdenv.lib; { + homepage = https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/; + description = "A tool for generating import manifests for Ugarit"; + license = licenses.bsd3; + maintainers = [ maintainers.ebzzry ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix new file mode 100644 index 000000000000..182af5328eeb --- /dev/null +++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix @@ -0,0 +1,431 @@ +{ pkgs, stdenv, eggDerivation, fetchegg }: +rec { + blob-utils = eggDerivation { + name = "blob-utils-1.0.3"; + + src = fetchegg { + name = "blob-utils"; + version = "1.0.3"; + sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml"; + }; + + buildInputs = [ + setup-helper + string-utils + ]; + }; + + check-errors = eggDerivation { + name = "check-errors-1.13.0"; + + src = fetchegg { + name = "check-errors"; + version = "1.13.0"; + sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi"; + }; + + buildInputs = [ + setup-helper + ]; + }; + + crypto-tools = eggDerivation { + name = "crypto-tools-1.3"; + + src = fetchegg { + name = "crypto-tools"; + version = "1.3"; + sha256 = "0442wly63zis19vh8xc9nhxgp9sabaccxylpzmchd5f1d48iag65"; + }; + + buildInputs = [ + + ]; + }; + + fnmatch = eggDerivation { + name = "fnmatch-1.0.1"; + + src = fetchegg { + name = "fnmatch"; + version = "1.0.1"; + sha256 = "1m3jmyhkyqmjr7v628g6w5n3cqihcfnryrxn91k4597q7vjhikqr"; + }; + + buildInputs = [ + + ]; + }; + + foreigners = eggDerivation { + name = "foreigners-1.4.1"; + + src = fetchegg { + name = "foreigners"; + version = "1.4.1"; + sha256 = "07nvyadhkd52q0kkvch1a5d7ivpmrhmyg295s4mxb1nw4wz46gfz"; + }; + + buildInputs = [ + matchable + ]; + }; + + lookup-table = eggDerivation { + name = "lookup-table-1.13.5"; + + src = fetchegg { + name = "lookup-table"; + version = "1.13.5"; + sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb"; + }; + + buildInputs = [ + setup-helper + check-errors + miscmacros + record-variants + synch + ]; + }; + + lru-cache = eggDerivation { + name = "lru-cache-0.5.3"; + + src = fetchegg { + name = "lru-cache"; + version = "0.5.3"; + sha256 = "0z6g3106c4j21v968hfzy9nnbfq2d83y0nyd20aifpq4g55c0d40"; + }; + + buildInputs = [ + record-variants + ]; + }; + + matchable = eggDerivation { + name = "matchable-3.3"; + + src = fetchegg { + name = "matchable"; + version = "3.3"; + sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990"; + }; + + buildInputs = [ + + ]; + }; + + message-digest = eggDerivation { + name = "message-digest-3.1.0"; + + src = fetchegg { + name = "message-digest"; + version = "3.1.0"; + sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s"; + }; + + buildInputs = [ + setup-helper + miscmacros + check-errors + variable-item + blob-utils + string-utils + ]; + }; + + miscmacros = eggDerivation { + name = "miscmacros-2.96"; + + src = fetchegg { + name = "miscmacros"; + version = "2.96"; + sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc"; + }; + + buildInputs = [ + + ]; + }; + + numbers = eggDerivation { + name = "numbers-4.4"; + + src = fetchegg { + name = "numbers"; + version = "4.4"; + sha256 = "0bg5zs6jcr9arj4a7r2xqxf2n17bx93640jaivgchbdj1gixranm"; + }; + + buildInputs = [ + + ]; + }; + + parley = eggDerivation { + name = "parley-0.9.2"; + + src = fetchegg { + name = "parley"; + version = "0.9.2"; + sha256 = "1vsbx4dk1240gzq02slzmavd1jrq04qj7ssnvg15h8xh81xwhbbz"; + }; + + buildInputs = [ + stty + srfi-71 + miscmacros + ]; + }; + + pathname-expand = eggDerivation { + name = "pathname-expand-0.1"; + + src = fetchegg { + name = "pathname-expand"; + version = "0.1"; + sha256 = "14llya7l04z49xpi3iylk8aglrw968vy304ymavhhqlyzmzwkx3g"; + }; + + buildInputs = [ + + ]; + }; + + posix-extras = eggDerivation { + name = "posix-extras-0.1.6"; + + src = fetchegg { + name = "posix-extras"; + version = "0.1.6"; + sha256 = "0gnmhn2l0161ham7f8i0lx1ay94ap8l8l7ga4nw9qs86lk024abi"; + }; + + buildInputs = [ + + ]; + }; + + record-variants = eggDerivation { + name = "record-variants-0.5.1"; + + src = fetchegg { + name = "record-variants"; + version = "0.5.1"; + sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h"; + }; + + buildInputs = [ + + ]; + }; + + regex = eggDerivation { + name = "regex-1.0"; + + src = fetchegg { + name = "regex"; + version = "1.0"; + sha256 = "1z9bh7xvab6h5cdlsz8jk02pv5py1i6ryqarbcs3wdgkkjgmmkif"; + }; + + buildInputs = [ + + ]; + }; + + setup-helper = eggDerivation { + name = "setup-helper-1.5.5"; + + src = fetchegg { + name = "setup-helper"; + version = "1.5.5"; + sha256 = "1lpplp8f2wyc486dd98gs4wl1kkhh1cs6vdqkxrdk7f92ikmwbx3"; + }; + + buildInputs = [ + + ]; + }; + + sql-de-lite = eggDerivation { + name = "sql-de-lite-0.6.6"; + + src = fetchegg { + name = "sql-de-lite"; + version = "0.6.6"; + sha256 = "1mh3hpsibq2gxcpjaycqa4ckznj268xpfzsa6pn0i6iac6my3qra"; + }; + + buildInputs = [ + lru-cache + foreigners + ]; + }; + + srfi-37 = eggDerivation { + name = "srfi-37-1.3.1"; + + src = fetchegg { + name = "srfi-37"; + version = "1.3.1"; + sha256 = "1a2zdkdzrv15fw9dfdy8067fsgh4kr8ppffm8mc3cmlczrrd58cb"; + }; + + buildInputs = [ + + ]; + }; + + srfi-71 = eggDerivation { + name = "srfi-71-1.1"; + + src = fetchegg { + name = "srfi-71"; + version = "1.1"; + sha256 = "01mlaxw2lfczykmx69xki2s0f4ywlg794rl4kz07plvzn0s3fbqq"; + }; + + buildInputs = [ + + ]; + }; + + ssql = eggDerivation { + name = "ssql-0.2.2"; + + src = fetchegg { + name = "ssql"; + version = "0.2.2"; + sha256 = "10557ymy0fgvqqazsg2jsbqvng0b91jqcjfgsxkrq8xs3klyd5mf"; + }; + + buildInputs = [ + matchable + ]; + }; + + string-utils = eggDerivation { + name = "string-utils-1.2.4"; + + src = fetchegg { + name = "string-utils"; + version = "1.2.4"; + sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1"; + }; + + buildInputs = [ + setup-helper + miscmacros + lookup-table + check-errors + ]; + }; + + stty = eggDerivation { + name = "stty-0.2.6"; + + src = fetchegg { + name = "stty"; + version = "0.2.6"; + sha256 = "09jmjpdsd3yg6d0f0imcihmn49i28x09lgl60i2dllffs25k22s4"; + }; + + buildInputs = [ + setup-helper + foreigners + ]; + }; + + synch = eggDerivation { + name = "synch-2.1.2"; + + src = fetchegg { + name = "synch"; + version = "2.1.2"; + sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00"; + }; + + buildInputs = [ + setup-helper + check-errors + ]; + }; + + tiger-hash = eggDerivation { + name = "tiger-hash-3.1.0"; + + src = fetchegg { + name = "tiger-hash"; + version = "3.1.0"; + sha256 = "0j9dsbjp9cw0y4w4srg0qwgh53jw2v3mx4y4h040ds0fkxlzzknx"; + }; + + buildInputs = [ + message-digest + ]; + }; + + ugarit = eggDerivation { + name = "ugarit-2.0"; + + src = fetchegg { + name = "ugarit"; + version = "2.0"; + sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n"; + }; + + buildInputs = [ + miscmacros + sql-de-lite + crypto-tools + srfi-37 + stty + matchable + regex + tiger-hash + message-digest + posix-extras + parley + ssql + pathname-expand + ]; + }; + + ugarit-manifest-maker = eggDerivation { + name = "ugarit-manifest-maker-0.1"; + + src = fetchegg { + name = "ugarit-manifest-maker"; + version = "0.1"; + sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q"; + }; + + buildInputs = [ + matchable + srfi-37 + fnmatch + miscmacros + ugarit + numbers + ]; + }; + + variable-item = eggDerivation { + name = "variable-item-1.3.1"; + + src = fetchegg { + name = "variable-item"; + version = "1.3.1"; + sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n"; + }; + + buildInputs = [ + setup-helper + check-errors + ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 118e5358fffb..143ce5b7383a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3646,6 +3646,8 @@ let ugarit = callPackage ../tools/backup/ugarit { }; + ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { }; + unarj = callPackage ../tools/archivers/unarj { }; unshield = callPackage ../tools/archivers/unshield { }; From 6d6a7881efea68cadd1237a4c3f0bb652a7157b1 Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:11:28 +0100 Subject: [PATCH 05/26] gnome3.libgxps: Fix dependency propagation bug Packages that want to use libgxps also need libarchive, thus it is moved to propagatedBuildInputs. --- pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix index 72d307f4f1a7..5168dec203fa 100644 --- a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; }; - buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr]; + buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr]; + propagatedBuildInputs = [ libarchive ]; configureFlags = "--without-liblcms2"; From 58cbe7d068ceb54951ba8fb68b31ba7c86c0a9cc Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Fri, 19 Feb 2016 20:15:19 +0100 Subject: [PATCH 06/26] gnome3.evince: Add XPS file support XPS support is optional via supportXPS argument and turned off by default. --- pkgs/desktops/gnome-3/3.18/core/evince/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix index 154182eef887..3220e9060643 100644 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix @@ -1,8 +1,9 @@ { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 , poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper -, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number -, gobjectIntrospection +, librsvg, gobjectIntrospection +, recentListSize ? null # 5 is not enough, allow passing a different number +, supportXPS ? false # Open XML Paper Specification via libgxps }: stdenv.mkDerivation rec { @@ -15,11 +16,12 @@ stdenv.mkDerivation rec { gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas poppler ghostscriptX djvulibre libspectre makeWrapper libsecret librsvg gnome3.adwaita-icon-theme - ]; + ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; configureFlags = [ "--disable-nautilus" # Do not use nautilus "--enable-introspection" + (if supportXPS then "--enable-xps" else "--disable-xps") ]; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; From 94a401258d01aab403241540217ab01901742454 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 19 Feb 2016 22:48:42 +0100 Subject: [PATCH 07/26] libfilezilla: init at 0.3.1 --- .../libraries/libfilezilla/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libfilezilla/default.nix diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix new file mode 100644 index 000000000000..74ca0a30892b --- /dev/null +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libfilezilla-${version}"; + version = "0.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; + sha256 = "1vshy00bz9l5nzphkxpd35plcfcrz2wha5qiic7mx5yywafdxbd4"; + }; + + meta = with stdenv.lib; { + homepage = https://lib.filezilla-project.org/; + description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01cd56d33c98..a219658881a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7336,6 +7336,8 @@ let libfakekey = callPackage ../development/libraries/libfakekey { }; + libfilezilla = callPackage ../development/libraries/libfilezilla { }; + libfm = callPackage ../development/libraries/libfm { }; libfm-extra = callPackage ../development/libraries/libfm { extraOnly = true; From 8b06e2fab152e5dee87693341d5938b161f959b5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 19 Feb 2016 22:49:13 +0100 Subject: [PATCH 08/26] filezilla: 3.14.1 -> 3.15.0.2 --- pkgs/applications/networking/ftp/filezilla/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 6c8df2fcd65b..8f53102d5f53 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext -, pkgconfig, xdg_utils, gtk2, sqlite, pugixml }: +, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla }: -let version = "3.14.1"; in +let version = "3.15.0.2"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0v6lb7miy6jbnswii816na8818xqxlvs1vadnii21xfmrsv7225i"; + sha256 = "0kvwkz01v73qi8y6n8wlidglwh0vg7pajsjm8xq7gch6jmq4cg1k"; }; configureFlags = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite - pugixml ]; + pugixml libfilezilla ]; meta = with stdenv.lib; { homepage = http://filezilla-project.org/; From 17aefb1460f9ac0b9647eae3bf0c5d06a2ed0276 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Thu, 18 Feb 2016 01:07:23 -0500 Subject: [PATCH 09/26] weechat: make language plugins optional, fixes #13092 They're still enabled by default, but now can be disabled. Python has not been made optional due to the additional complexity of: - python2 vs python3 - pync support on Darwin Making Python support optional should be revisited at another time. --- .../networking/irc/weechat/default.nix | 48 +++++++++++++++---- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index a781a8ceb353..54bba77b182b 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -1,8 +1,24 @@ -{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls -, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile -, pythonPackages, cmake, makeWrapper, libobjc, libiconv +{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls +, zlib, curl , pkgconfig, libgcrypt +, cmake, makeWrapper, libobjc, libiconv +, guileSupport ? true, guile +, luaSupport ? true, lua5 +, perlSupport ? true, perl +, pythonPackages +, rubySupport ? true, ruby +, tclSupport ? true, tcl , extraBuildInputs ? [] }: +assert guileSupport -> guile != null; +assert luaSupport -> lua5 != null; +assert perlSupport -> perl != null; +assert rubySupport -> ruby != null; +assert tclSupport -> tcl != null; + +let + inherit (pythonPackages) python pycrypto pync; +in + stdenv.mkDerivation rec { version = "1.4"; name = "weechat-${version}"; @@ -12,14 +28,26 @@ stdenv.mkDerivation rec { sha256 = "1m6xq6izcac5186xvvmm8znfjzrg9hq42p69jabdvv7cri4rjvg0"; }; - cmakeFlags = stdenv.lib.optional stdenv.isDarwin - "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"; + cmakeFlags = with stdenv.lib; [] + ++ optional stdenv.isDarwin "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" + ++ optional (!guileSupport) "-DENABLE_GUILE=OFF" + ++ optional (!luaSupport) "-DENABLE_LUA=OFF" + ++ optional (!perlSupport) "-DENABLE_PERL=OFF" + ++ optional (!rubySupport) "-DENABLE_RUBY=OFF" + ++ optional (!tclSupport) "-DENABLE_TCL=OFF" + ; - buildInputs = - [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig - libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper - cmake ] - ++ stdenv.lib.optionals stdenv.isDarwin [ pythonPackages.pync libobjc ] + buildInputs = with stdenv.lib; [ + ncurses python openssl aspell gnutls zlib curl pkgconfig + libgcrypt pycrypto makeWrapper + cmake + ] + ++ optionals stdenv.isDarwin [ pync libobjc ] + ++ optional guileSupport guile + ++ optional luaSupport lua5 + ++ optional perlSupport perl + ++ optional rubySupport ruby + ++ optional tclSupport tcl ++ extraBuildInputs; NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=/etc/ssl/certs/ca-certificates.crt"; From c5416370d50a3bc6d03624cf85eb2329ae4b3798 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Sat, 20 Feb 2016 00:07:15 +0200 Subject: [PATCH 10/26] pycontracts: init at 1.7.9 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ec275834e8f..a98bc5e93af4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3906,6 +3906,26 @@ in modules // { }; }; + pycontracts = buildPythonPackage rec { + version = "1.7.9"; + name = "PyContracts-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyContracts/${name}.tar.gz"; + sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf"; + }; + + buildInputs = with self; [ nose ]; + + propagatedBuildInputs = with self; [ pyparsing decorator six ]; + + meta = { + description = "Allows to declare constraints on function parameters and return values."; + homepage = https://pypi.python.org/pypi/PyContracts; + license = licenses.lgpl2; + }; + }; + pycparser = buildPythonPackage rec { name = "pycparser-${version}"; version = "2.14"; From 433f979cee469434081b6c7cdf69d5f949f32ebb Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 19 Feb 2016 22:56:19 +0000 Subject: [PATCH 11/26] zerotierone: adopt systemd unit from upstream See https://github.com/zerotier/ZeroTierOne/blob/5db538d85ef739fa969a5b71d294501ac0bb5335/ext/installfiles/linux/systemd/zerotier-one.service --- nixos/modules/services/networking/zerotierone.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index 886ea18d9809..6237f95b127b 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -21,10 +21,9 @@ in chown -R root:root /var/lib/zerotier-one ''; serviceConfig = { - Type = "forking"; - User = "root"; - PIDFile = "/var/lib/zerotier-one/zerotier-one.pid"; - ExecStart = "${pkgs.zerotierone}/bin/zerotier-one -d"; + ExecStart = "${pkgs.zerotierone}/bin/zerotier-one"; + Restart = "always"; + KillMode = "process"; }; }; environment.systemPackages = [ pkgs.zerotierone ]; From 99910d97c2e95e8e85a14d2aced3a7c3be9ca547 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 19 Feb 2016 23:01:30 +0000 Subject: [PATCH 12/26] zerotierone: 1.1.0 -> 1.1.4 --- pkgs/tools/networking/zerotierone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index d9a50d7dc696..e2ba2102d76b 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.4"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "2d7ff178bd7fd284ebb7011d8a91bde51befda60f100eb5429a2dcb6626cf676"; + sha256 = "10aw0dlkmprdvph3aqkqximxqkryf0l4jcnv2bbm7f1qvclqihva"; }; preConfigure = '' From e51d562f9f9f44798e48248cb11d0e58b55a3cb1 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 19 Feb 2016 23:08:04 +0100 Subject: [PATCH 13/26] perl-podlators: 2.5.3 -> 4.06 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fa95c98dbca5..2c36d38abbb1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9739,11 +9739,11 @@ let self = _self // overrides; _self = with self; { }; }; - podlators = buildPerlPackage { - name = "podlators-2.5.3"; + podlators = buildPerlPackage rec { + name = "podlators-4.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz; - sha256 = "c80d6d65a8694720deff1c6b2067d7564727db713b6d6b536afbad70299647d1"; + url = "mirror://cpan/authors/id/R/RR/RRA/${name}.tar.gz"; + sha256 = "0fsb1k88fsqwgmk5fkcz57jf27g6ip4ncikawslm596d1si2h48a"; }; meta = { description = "Convert POD data to various other formats"; From 06424612e680cfd526f9d515aaa58586c255a2c2 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 19 Feb 2016 23:40:56 +0100 Subject: [PATCH 14/26] perl-MooseX-Role-WithOverloading: 0.13 -> 0.17 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2c36d38abbb1..b03290cf8e9e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8149,10 +8149,10 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXRoleWithOverloading = buildPerlPackage { - name = "MooseX-Role-WithOverloading-0.13"; + MooseXRoleWithOverloading = buildPerlPackage rec { + name = "MooseX-Role-WithOverloading-0.17"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw"; }; buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata]; From a0912fd3b4d4ff5c1d601d37dd1f436b54fab02c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 20 Feb 2016 11:36:16 +0100 Subject: [PATCH 15/26] lazarus: 1.4.4 -> 1.6 --- pkgs/development/compilers/fpc/lazarus.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index c579ba5612a2..0db5f03a1ab9 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -8,10 +8,10 @@ stdenv, fetchurl let s = rec { - version = "1.4.4"; - versionSuffix = "-0"; + version = "1.6"; + versionSuffix = ".0-0"; url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz"; - sha256 = "12w3xwqif96a65b0ygi4riqrp0122wsp0ykb1j7k8hjfyk91x91a"; + sha256 = "1a1w9yibi0rsr51bl7csnq6mr59x0934850kiabs80nr3sz05knb"; name = "lazarus-${version}"; }; buildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation { "bigide" ]; preBuild = '' - export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/lazarus/ INSTALL_PREFIX=$out/" + export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/share/lazarus/ INSTALL_PREFIX=$out/" export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.cc.cc}/lib -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s" export LCL_PLATFORM=gtk2 mkdir -p $out/share "$out/lazarus" From e1a3b4128fe9107d21b28334cc3e434c982ec200 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Fri, 19 Feb 2016 14:56:59 -0800 Subject: [PATCH 16/26] mpv: 0.14.0 -> 0.15.0 --- pkgs/applications/video/mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 38efe61a7df5..5bc2eee24145 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${meta.version}.tar.gz"; - sha256 = "0cqjwl0xyg0sv1jflipfkvqjg32y0kqfh4gc3lyhqgv0hgs3fa84"; + sha256 = "1p0b83048g66icpz5n66v3k4ldr1z0rmg5d2rr7kcbspm1xj2cbx"; }; patchPhase = '' @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - version = "0.14.0"; + version = "0.15.0"; description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; homepage = http://mpv.io; license = licenses.gpl2Plus; From 9e0b5358e2df4e265de30692a7f718c84909af4e Mon Sep 17 00:00:00 2001 From: mingchuan Date: Sat, 20 Feb 2016 19:24:25 +0800 Subject: [PATCH 17/26] pcmanx-gtk2: init at 1.3 --- lib/maintainers.nix | 1 + .../applications/misc/pcmanx-gtk2/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/misc/pcmanx-gtk2/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7426e18a61b9..39d91df04987 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -211,6 +211,7 @@ meisternu = "Matt Miemiec "; michelk = "Michel Kuhlmann "; michaelpj = "Michael Peyton Jones "; + mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; mschristiansen = "Mikkel Christiansen "; modulistic = "Pablo Costa "; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix new file mode 100644 index 000000000000..fb655ceba5dc --- /dev/null +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }: + +stdenv.mkDerivation { + name = "pcmanx-gtk2-1.3"; + src = fetchurl { + url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz"; + sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302"; + }; + + buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ]; + + preConfigurePhases = '' + ./autogen.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://pcman.ptt.cc"; + license = licenses.gpl2; + description = "Telnet BBS browser with GTK+ interface"; + maintainers = [ maintainers.mingchuan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a219658881a7..c7a754421985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12898,6 +12898,8 @@ let pcmanfm = callPackage ../applications/misc/pcmanfm { }; + pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { }; + pig = callPackage ../applications/networking/cluster/pig { }; pijul = callPackage ../applications/version-management/pijul { From 9eb6372c6be1057d69e40b0c7c5d3978e2ca9f6c Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 20 Feb 2016 14:02:38 +0100 Subject: [PATCH 18/26] teamviewer: fix wrong in sed usage --- pkgs/applications/networking/remote/teamviewer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index dd947d86daf8..1abedc890f46 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { ${if stdenv.system == "x86_64-linux" then '' sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config '' else '' - sed -i ",TV_LD64_PATH=.*,d" script/tvw_config + sed -i "/TV_LD64_PATH=.*/d" script/tvw_config ''} sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop From bd8158593d837b1bc521a3bf183b2cc1675aa8ce Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 20 Feb 2016 07:10:58 -0600 Subject: [PATCH 19/26] spotify: 1.0.19.106 -> 1.0.23.93 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index f345e9710d2f..bf06761bc533 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,7 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.19.106.gb8a7150f"; + version = "1.0.23.93.gd6cfae15-30"; deps = [ alsaLib @@ -50,7 +50,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be"; + sha256 = "0n6vz51jv6s20dp4zlqkk52bpmpyfm1qn5bfm4lfq09x1g6ir5lr"; }; buildInputs = [ dpkg makeWrapper ]; From 0e96c96b84852a5e81134bcfb5d34a3def3f995f Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sat, 20 Feb 2016 14:44:41 +0100 Subject: [PATCH 20/26] mosquitto: Use built-in Makefile for installation. This will also install man pages, client-binaries (mosquitto_sub, mosquitto_pub), libs, headers, etc. --- pkgs/servers/mqtt/mosquitto/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 4fdb475d89b8..0dacaf4cfe47 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -13,11 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libuuid ]; - buildFlags = "mosquitto"; + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; - installPhase = '' - mkdir -p $out/bin - cp src/mosquitto $out/bin/ + preBuild = '' + substituteInPlace config.mk \ + --replace "/usr/local" "" ''; meta = { From b18bc4f5b655eac05705e2e9d00f552a676f7cc1 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Fri, 19 Feb 2016 23:53:13 +0200 Subject: [PATCH 21/26] ldap3: init at 1.0.4 --- pkgs/top-level/python-packages.nix | 83 ++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ec275834e8f..ee59c2597640 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9092,6 +9092,22 @@ in modules // { }; }); + forbiddenfruit = buildPythonPackage rec { + version = "0.1.0"; + name = "forbiddenfruit-${version}"; + + src = pkgs.fetchurl { + url= "https://pypi.python.org/packages/source/f/forbiddenfruit/${name}.tar.gz"; + sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79"; + }; + + meta = { + description = "Patch python built-in objects"; + homepage = https://pypi.python.org/pypi/forbiddenfruit; + license = licenses.mit; + }; + }; + fs = buildPythonPackage rec { name = "fs-0.5.4"; @@ -9638,6 +9654,32 @@ in modules // { }; }; + gssapi = buildPythonPackage rec { + version = "1.1.4"; + name = "gssapi-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/gssapi/${name}.tar.gz"; + sha256 = "0mdl7m6h57n0zkfmm6fqz0hldfxrb2d7d48k2lhc8hqbr3962c7x"; + }; + + GSSAPI_SUPPORT_DETECT = "false"; + LD_LIBRARY_PATH="${pkgs.krb5Full}/lib"; + + buildInputs = [ pkgs.gss pkgs.krb5Full pkgs.which + self.nose self.shouldbe ]; + + propagatedBuildInputs = with self; [ decorator enum34 six ]; + + doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local' + + meta = { + homepage = https://pypi.python.org/pypi/gssapi; + description = "Python GSSAPI Wrapper"; + license = licenses.mit; + }; + }; + gyp = buildPythonPackage rec { name = "gyp-${version}"; version = "2015-06-11"; @@ -16996,6 +17038,26 @@ in modules // { propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl]; }; + ldap3 = buildPythonPackage rec { + version = "1.0.4"; + name = "ldap3-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/l/ldap3/${name}.tar.gz"; + sha256 = "0j4qqj9vq022hy7wfqn8s0j4vm2g6paabbzas1vbyspawvcfai98"; + }; + + buildInputs = with self; [ gssapi ]; + + propagatedBuildInputs = with self; [ pyasn1 ]; + + meta = { + homepage = https://pypi.python.org/pypi/ldap3; + description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; + license = licenses.lgpl3; + }; + }; + ptest = buildPythonPackage rec { name = pname + "-" + version; pname = "ptest"; @@ -19003,6 +19065,27 @@ in modules // { }; }; + shouldbe = buildPythonPackage rec { + version = "0.1.0"; + name = "shouldbe-${version}"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/s/shouldbe/${name}.tar.gz"; + sha256 = "07pchxpv1xvjbck0xy44k3a1jrvklg0wbyccn14w0i7d135d4174"; + }; + + buildInputs = with self; [ nose ]; + + propagatedBuildInputs = with self; [ forbiddenfruit ]; + + doCheck = false; # Segmentation fault on py 3.5 + + meta = { + description = "Python Assertion Helpers inspired by Shouldly"; + homepage = https://pypi.python.org/pypi/shouldbe/; + license = licenses.mit; + }; + }; simplejson = buildPythonPackage (rec { name = "simplejson-3.8.1"; From b4eebd86c16957222e9bc05de6b2cae27ac6b1d9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 20 Feb 2016 16:12:32 +0100 Subject: [PATCH 22/26] Be less location-dependent --- maintainers/scripts/nix-call-package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/nix-call-package b/maintainers/scripts/nix-call-package index 76f09e9ddeb8..be478fca2b75 100755 --- a/maintainers/scripts/nix-call-package +++ b/maintainers/scripts/nix-call-package @@ -1,5 +1,5 @@ #! /bin/sh -echo "let pkgs = import /etc/nixos/nixpkgs$2 {}; x = pkgs.callPackage $1 { $3 }; in ${4:-x}" | +echo "let pkgs = import {}; x = pkgs.callPackage $1 { $3 }; in ${4:-x}" | nix-instantiate --show-trace - | xargs nix-store -r -K From 113106df1b8e2bbb1ba6cb8b11b36cd7be3e393d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 20 Feb 2016 12:14:29 +0100 Subject: [PATCH 23/26] ddclient: 3.8.2 -> 3.8.3 Also remove patch for issue that has been fixed upstream, add simple meta section, and minor other cleanups. --- .../ddclient/ddclient-foreground.patch | 12 ---------- pkgs/tools/networking/ddclient/default.nix | 23 ++++++++++++------- 2 files changed, 15 insertions(+), 20 deletions(-) delete mode 100644 pkgs/tools/networking/ddclient/ddclient-foreground.patch diff --git a/pkgs/tools/networking/ddclient/ddclient-foreground.patch b/pkgs/tools/networking/ddclient/ddclient-foreground.patch deleted file mode 100644 index 1ae3621f5079..000000000000 --- a/pkgs/tools/networking/ddclient/ddclient-foreground.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient ---- ddclient-3.8.1/ddclient 2011-07-11 23:04:21.000000000 +0200 -+++ ddclient-3.8.1.patched/ddclient 2012-11-08 11:52:31.930647236 +0100 -@@ -574,7 +574,7 @@ - "usage: ${program} [options]", - "options are:", - [ "daemon", "=s", "-daemon delay : run as a daemon, specify delay as an interval." ], --+ [ "foreground", "!", "-foreground : do not fork" ], -+ [ "foreground", "!", "-foreground : do not fork" ], - [ "proxy", "=s", "-proxy host : use 'host' as the HTTP proxy" ], - [ "server", "=s", "-server host : update DNS information on 'host'" ], - [ "protocol", "=s", "-protocol type : update protocol used" ], diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 41688d843513..1664fbf37077 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -1,24 +1,25 @@ -{buildPerlPackage, fetchurl, perlPackages, iproute}: +{ stdenv, buildPerlPackage, fetchurl, perlPackages, iproute }: -buildPerlPackage { - name = "ddclient-3.8.2"; +buildPerlPackage rec { + name = "ddclient-${version}"; + version = "3.8.3"; src = fetchurl { - url = mirror://sourceforge/ddclient/ddclient-3.8.2.tar.gz ; - sha256 = "17mcdqxcwa6c05m8xhxi4r37j4qvbp3wgbpvzqgmrmgwava5wcrw"; + url = "mirror://sourceforge/ddclient/${name}.tar.gz"; + sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy"; }; buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ]; - patches = [ ./ddclient-foreground.patch ./ddclient-line-buffer-stdout.patch ]; + patches = [ ./ddclient-line-buffer-stdout.patch ]; # Use iproute2 instead of ifconfig - preConfigure = '' + preConfigure = '' touch Makefile.PL substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show' substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show' substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg' - ''; + ''; installPhase = '' mkdir -p $out/bin @@ -26,4 +27,10 @@ buildPerlPackage { ''; doCheck = false; + + meta = with stdenv.lib; { + homepage = https://sourceforge.net/p/ddclient/wiki/Home/; + description = "Client for updating dynamic DNS service entries"; + license = licenses.gpl2Plus; + }; } From 686c09dd38a58287586da83ca31afd5dfbd3bf5c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 20 Feb 2016 17:41:02 +0000 Subject: [PATCH 24/26] wpa_supplicant module: after network-interfaces.target fixes #13136 --- nixos/modules/services/networking/wpa_supplicant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 1558c5832892..88345fdc11e7 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -127,6 +127,7 @@ in { in { description = "WPA Supplicant"; + after = [ "network-interfaces.target" ]; wantedBy = [ "network.target" ]; path = [ pkgs.wpa_supplicant ]; From 50f45db51c33ec784bdbc5f4a7c7325559087e53 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 20 Feb 2016 20:27:56 +0100 Subject: [PATCH 25/26] icmake: 8.00.05 -> 8.01.00 --- pkgs/development/tools/build-managers/icmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index b3788d7f324d..e4bad4f500c8 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "icmake-${version}"; - version = "8.00.05"; + version = "8.01.00"; src = fetchFromGitHub { - sha256 = "06bfz9awi2vh2mzikw4sp7wqrp0nlcg89b9br43awz2801k15hpf"; + sha256 = "1vgjywbc4w1agkakfndr2qf0z0ncxisihdv8sz9ipry9f170np39"; rev = version; repo = "icmake"; owner = "fbb-git"; From 3e7e8e88078b6e73b7b72aa64efd87bf4feedc2c Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 20 Feb 2016 22:27:15 +0000 Subject: [PATCH 26/26] voxelands: 1506.00 -> 1512.00 source had been moved --- pkgs/games/voxelands/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 4c0c76d60b8c..c3ec47273d8f 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "voxelands-${version}"; - version = "1506.00"; + version = "1512.00"; src = fetchurl { - url = "http://voxelands.com/downloads/${name}-src.tar.bz2"; - sha256 = "0j82zidxv2rzx7fmw5z27nfldqkixbrs1f6l3fs433xr3d05406y"; + url = "http://voxelands.com/downloads/${name}-src.tar.bz2"; + sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw"; }; cmakeFlags = [