diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-09 12:25:54 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-09 12:25:54 +0000 |
commit | 5d13702776901be98e0d9252cc4a26fd25b7960a (patch) | |
tree | 30558ac58e4fe0d72acf804fa0b1d344671f0445 /pkgs | |
parent | c5eea46e603e1247bf67a4dd6b61d883e7e69b8c (diff) | |
parent | a262124577f4e14a83cdb9125752bffb037b019e (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs')
23 files changed, 199 insertions, 126 deletions
diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix index 5d0f07492a1b2..8692ac98933b7 100644 --- a/pkgs/applications/misc/foxtrotgps/default.nix +++ b/pkgs/applications/misc/foxtrotgps/default.nix @@ -6,8 +6,8 @@ let srcs = { foxtrot = fetchbzr { url = "lp:foxtrotgps"; - rev = "326"; - sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k"; + rev = "329"; + sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid"; }; screenshots = fetchbzr { url = "lp:foxtrotgps/screenshots"; @@ -17,23 +17,21 @@ let }; in stdenv.mkDerivation rec { pname = "foxtrotgps"; - version = "1.2.2+326"; + version = "1.2.2+329"; # Pull directly from bzr because gpsd API version 9 is not supported on latest release src = srcs.foxtrot; - patches = [ - ./gps-status-fix.patch + nativeBuildInputs = [ + pkg-config autoreconfHook texinfo help2man + imagemagick wrapGAppsHook intltool ]; - nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ]; - buildInputs = [ curl.dev gnome2.libglade.dev gpsd gtk2.dev - intltool libexif sqlite.dev (python3Packages.python.withPackages (pythonPackages: with python3Packages; @@ -58,7 +56,7 @@ in stdenv.mkDerivation rec { innovation. ''; homepage = "https://www.foxtrotgps.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ wucke13 ]; }; diff --git a/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch b/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch deleted file mode 100644 index e9b3624a174b9..0000000000000 --- a/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- foxtrot/src/gps_functions.c.orig 2020-12-04 15:02:22.290163204 -0600 -+++ foxtrot/src/gps_functions.c 2020-12-04 15:04:54.470648534 -0600 -@@ -762,7 +762,11 @@ - { - gpsdata->fix.time = (time_t) 0; - } -+#if GPSD_API_MAJOR_VERSION >= 9 -+ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); -+#else - gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); -+#endif - if (gpsdata->valid) - { - gpsdata->seen_valid = TRUE; diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix deleted file mode 100644 index c4a67c8098a30..0000000000000 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, fetchFromGitHub, python27Packages }: - -python27Packages.buildPythonApplication rec { - version = "2016-07-29"; - name = "qweechat-unstable-${version}"; - namePrefix = ""; - - src = fetchFromGitHub { - owner = "weechat"; - repo = "qweechat"; - rev = "f5e54d01691adb3abef47e051a6412186c33313c"; - sha256 = "0dhlriwvkrsn7jj01p2wqhf2p63n9qd173jsgccgxlacm2zzvhaz"; - }; - - prePatch = '' - substituteInPlace setup.py \ - --replace 'qweechat = qweechat.qweechat' 'qweechat = qweechat.qweechat:main' - ''; - - propagatedBuildInputs = with python27Packages; [ - pyside setuptools - ]; - - meta = with lib; { - homepage = "https://github.com/weechat/qweechat"; - description = "Qt remote GUI for WeeChat"; - license = licenses.gpl3; - maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 91673ed146aae..1584972cbebd5 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.95"; + version = "5.0.96"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "16rahl14clgnl7gzpw7rxx23yxbw1nbrz219q051zkjkkw5ai8lv"; + sha256 = "sha256-W8Iu8UoTqC3aK7lB4bq1L7cNmjaEvjEK+ODcZ9kk3f8="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index a5bd030e470cc..a1ccc353d561b 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,16 +1,15 @@ { mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv -# "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google -# account. You'll need to generate (and please share :-) a new one if it breaks. -, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: +# "Free" key generated by pasqui23 +, withAPIKey ? "AIzaSyBQvZXseEVvgu5Ega_DI-AIJ55v0OsHmVY" }: mkDerivation rec { pname = "minitube"; - version = "3.6"; + version = "3.8.1"; src = fetchFromGitHub { - sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU="; + sha256 = "3lpZyPwo4NnxZJKfmCFsH4WdakV4KB5BtCr5xsleeIQ="; rev = version; repo = "minitube"; owner = "flaviotordini"; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4d57b3991998d..e9014a889540c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -518,9 +518,9 @@ rec { }; result = runCommand "docker-image-${baseName}.tar.gz" { nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ]; - # Image name and tag must be lowercase + # Image name must be lowercase imageName = lib.toLower name; - imageTag = if tag == null then "" else lib.toLower tag; + imageTag = if tag == null then "" else tag; inherit fromImage baseJson; layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index a4b884147db17..84d51a2bc3f63 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -25,10 +25,11 @@ gccStdenv.mkDerivation rec { inherit src version git-version; bootstrap = gambit-support.gambit-bootstrap; + nativeBuildInputs = [ git autoconf ]; # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. - buildInputs = [ git autoconf bootstrap openssl ]; + buildInputs = [ openssl ]; # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more? # Or wrap relevant programs to add a suitable PATH ? @@ -62,11 +63,11 @@ gccStdenv.mkDerivation rec { lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' - export CC=${gcc}/bin/gcc \ - CXX=${gcc}/bin/g++ \ - CPP=${gcc}/bin/cpp \ - CXXCPP=${gcc}/bin/cpp \ - LD=${gcc}/bin/ld \ + export CC=${gccStdenv.cc.targetPrefix}gcc \ + CXX=${gccStdenv.cc.targetPrefix}g++ \ + CPP=${gccStdenv.cc.targetPrefix}cpp \ + CXXCPP=${gccStdenv.cc.targetPrefix}cpp \ + LD=${gccStdenv.cc.targetPrefix}ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS @@ -76,22 +77,23 @@ gccStdenv.mkDerivation rec { # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - --replace /usr/local/opt/openssl/lib "${openssl.out}/lib" \ - --replace /usr/local/opt/openssl@1.1/lib "${openssl.out}/lib" + --replace "/usr/local/opt/openssl@1.1" "${openssl.out}" \ + --replace "/usr/local/opt/openssl" "${openssl.out}" + ./config.status ''; buildPhase = '' # Make bootstrap compiler, from release bootstrap - mkdir -p boot && - cp -rp ${bootstrap}/gambit/. boot/. && - chmod -R u+w boot && - cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */ - ./configure && - for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done && - cd .. && - cp boot/gsc/gsc gsc-boot && + mkdir -p boot + cp -rp ${bootstrap}/gambit/. boot/. + chmod -R u+w boot + cd boot + cp ../gsc/makefile.in ../gsc/*.scm gsc/ + ./configure + for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done + cd .. + cp boot/gsc/gsc gsc-boot # Now use the bootstrap compiler to build the real thing! make -j$NIX_BUILD_CORES from-scratch diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 8297dafff8e2d..3d2fd7551e67d 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, +{ pkgs, gccStdenv, lib, coreutils, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, version, git-version, gambit-support, diff --git a/pkgs/development/libraries/librsb/default.nix b/pkgs/development/libraries/librsb/default.nix new file mode 100644 index 0000000000000..ef8b9ee441d30 --- /dev/null +++ b/pkgs/development/libraries/librsb/default.nix @@ -0,0 +1,86 @@ +{ lib, stdenv, fetchurl +, gfortran +, pkg-config, libtool +, m4, gnum4 +, file +# Memory Hierarchy (End-user can provide this.) +, memHierarchy ? "" +# Headers/Libraries +, blas, zlib +# RPC headers (rpc/xdr.h) +, openmpi +, help2man +, doxygen +, octave +}: + +stdenv.mkDerivation rec { + pname = "librsb"; + version = "1.2.0.9"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1ynrsgnvv1jfm8dv3jwjrip9x9icxv7w3qrk149025j6fbaza8gl"; + }; + + # The default configure flags are still present when building + # --disable-static --disable-dependency-tracking + # Along with the --prefix=... flag (but we want that one). + configureFlags = [ + "--enable-static" + "--enable-doc-build" + "--enable-octave-testing" + "--enable-sparse-blas-interface" + "--enable-fortran-module-install" + "--enable-pkg-config-install" + "--enable-matrix-types=all" + "--with-zlib=${zlib}/lib/libz.so" + "--with-memhinfo=${memHierarchy}" + ]; + + # Ensure C/Fortran code is position-independent. + NIX_CFLAGS_COMPILE = [ "-fPIC" "-Ofast" ]; + FCFLAGS = [ "-fPIC" "-Ofast" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + gfortran + pkg-config libtool + m4 gnum4 + file + blas zlib + openmpi + octave + help2man # Turn "--help" into a man-page + doxygen # Build documentation + ]; + + # Need to run cleanall target to remove any previously-generated files. + preBuild = '' + make cleanall + ''; + + checkInputs = [ + octave + ]; + checkTarget = "tests"; + + meta = with lib; { + homepage = "http://librsb.sourceforge.net/"; + description = "Shared memory parallel sparse matrix and sparse BLAS library"; + longDescription = '' + Library for sparse matrix computations featuring the Recursive Sparse + Blocks (RSB) matrix format. This format allows cache efficient and + multi-threaded (that is, shared memory parallel) operations on large + sparse matrices. + librsb implements the Sparse BLAS standard, as specified in the BLAS + Forum documents. + Contains libraries and header files for developing applications that + want to make use of librsb. + ''; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ KarlJoad ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index d4b7f3ff9a129..7785a70e05094 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "3.2.0"; in +let version = "3.3.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "0a77njgc6c6kz4rpwqgmnii7f1na6hzsa55nqqm3dndhq9xh628w"; + sha256 = "002pqkcg18zx59hsf172wg6s7lwsiagp5sfvf5yssp7xxal5jdgx"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 04b611fd598fb..3301d949c2287 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "apcu"; - version = "5.1.19"; - sha256 = "1q3c4y9jqh1yz5vps2iiz2x04vn0y1g5ibxg1x8zp7n7sncvqzw3"; + version = "5.1.20"; + sha256 = "sha256-uZ1A+v7Ab00TL87lPnUm3b/B0EHqbgThc4nfrSj5w5A="; buildInputs = [ pcre' ]; doCheck = true; diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix index 0486db82cc3d7..0b485e048052a 100644 --- a/pkgs/development/php-packages/smbclient/default.nix +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -1,8 +1,8 @@ { buildPecl, lib, samba, pkg-config }: buildPecl { pname = "smbclient"; - version = "1.0.5"; - sha256 = "sha256-cNvTa1qzYrlhuX4oNehXt+XKqmqfonyomW/usQdQQO0="; + version = "1.0.6"; + sha256 = "sha256-ZsQzdDt6NLRWBsA75om9zkxSvB6zBsvvPhXJZrX/KNc="; # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0"; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 30a7e5174a6da..ea4910712ce22 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.10.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0jmgpvgn36kfc1sa27a1l1g26dawhl99a1wl8gn4ajbcbcvc2pkh"; + sha256 = "0li47fpm398dk69q6g2zjaxx46w00g3n0jszz88kf57sakri553y"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index f3dc0440ac5cf..71da12049e9d4 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ymqkjz1zk4gs0hkxjh07napc4k24xxb8f3pganw27fca60xcii0"; + sha256 = "0ihcxdkbm1lq79fdjmcrj316zh6sjlc3162yynww8nggv2mlnz6v"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index ed2f363901e1e..a9a9538f5b926 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0x2k95lwx2gz2zj2ys646qiylhyqzlbiqf1k3q1l8w1wlggwv3xp"; + sha256 = "0pk7h5wwvmdn74ngj5rspz7z9y80ryzgqd2z2qy7kf9chpz7qczk"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0fpam6x8x207la1xrr8m45yx35r646iizrs4gsaghlysmr95jb3i"; + sha256 = "1y9dpxi7r5r2ya5y0i28b4g5fvla6wrbjz9rffqaqldf4h316jx2"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0ari338hmi1bb1pln3mxv4k9aclbcby6z3km61wg3va511qhrrbq"; + sha256 = "0vhnqqxl693b2d14ayifpjz8zlg3dngl127svr08amzmbad7irh1"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0a5nrklyzfasaa119y4ivr7449rvsgifpkyravinacrl1g9phlls"; + sha256 = "1dgs33z3sjr3s8ymqyxjkx2g6iah3p91ng9hxllmyyp4xpxaxyhk"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0rris2p7ic9p9ms3qcczia4nn5mb1yx2gv5mlnmg2yligjad2jaf"; + sha256 = "06j6f2k0r8nyh8swh689cy4zq50lmy5glx0pa3zdpnk02k4x3q72"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 02139d15e75ab..7feb409a26d4c 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "10ap7jlxs9vcmnyafr62mxlgsp709165nw55xmv9sw18r7m8wsm6"; + sha256 = "0zrd9h9i7fnmh81zvscxzq3rspyvjvidzbgcziq2m0z522krs8qq"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 8a9e9c9080442..ab7a7b664b0d7 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, isPy27 , backports_ssl_match_hostname , mock , paramiko -, pytest , pytestCheckHook , requests , six @@ -11,11 +14,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.4.3"; + version = "4.4.4"; src = fetchPypi { inherit pname version; - sha256 = "de5753b7f6486dd541a98393e423e387579b8974a5068748b83f852cc76a89d6"; + sha256 = "d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db"; }; nativeBuildInputs = lib.optional isPy27 mock; @@ -32,8 +35,9 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ "tests/unit" ]; + # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket - disabledTests = lib.optionals stdenv.isDarwin [ "stream_response" "socket_file" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "api_test" "stream_response" "socket_file" ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index f658995fe9017..b5b0c8b81bf8c 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.10.0"; - # rev is the 3.9.3 commit, mainly for kustomize version command output - rev = "602ad8aa98e2e17f6c9119e027a09757e63c8bec"; + version = "4.0.5"; + # rev is the commit of the tag, mainly for kustomize version command output + rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,16 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1qr0mi83df8d9qd2svyr1h26pg97qi67nnygrkydnp8an28k48hi"; + sha256 = "sha256-rv65sDr6V6hEYgIRxS1OSu9txmW75F7/YGAy/zRXGyY="; }; + # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. + doCheck = false; + # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "0p2j8mm7jpladpm6v3451g38n5bax0g368dk5h5r5gmkr6srxdy4"; + vendorSha256 = "sha256-lLUi0vD7uyfDR4HjDiosoTU0NbfQTY7ewZGm38ZT9nU="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index f2fe3693ed7a0..50c1ba40759d4 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.2"; + version = "2.8.4"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72"; + sha256 = "1b78f8gk53m68i9igvfpylmvi55h4qqfwymknz1vval4flbj0r2f"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 77f45d06c91ca..6af582d91a7b1 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse, osxfuse }: stdenv.mkDerivation rec { pname = "unionfs-fuse"; @@ -11,16 +11,23 @@ stdenv.mkDerivation rec { sha256 = "0bwx70x834qgqh53vqp18bhbxbsny80hz922rbgj8k9wj7cbfilm"; }; - patches = - [ # Prevent the unionfs daemon from being killed during - # shutdown. See - # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ - # for details. - ./prevent-kill-on-shutdown.patch - ]; + patches = [ + # Prevent the unionfs daemon from being killed during + # shutdown. See + # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ + # for details. + ./prevent-kill-on-shutdown.patch + ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace '/usr/local/include/osxfuse/fuse' '${osxfuse}/include/osxfuse/fuse' + substituteInPlace src/CMakeLists.txt \ + --replace 'target_link_libraries(unionfs fuse pthread)' 'target_link_libraries(unionfs osxfuse pthread)' + ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse ]; + buildInputs = [ (if stdenv.isDarwin then osxfuse else fuse) ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: @@ -28,7 +35,7 @@ stdenv.mkDerivation rec { # # This must be done in preConfigure because the build process removes # helper from the source directory during the build. - preConfigure = '' + preConfigure = lib.optionalString (!stdenv.isDarwin) '' mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse @@ -39,7 +46,7 @@ stdenv.mkDerivation rec { description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 85a8cd5d76842..9fce8d7a5f415 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: +{ lib, stdenv +, nixosTests +, fetchurl, autoreconfHook +, zlib, pcre, w3m, man +, mbedtls, brotli +}: stdenv.mkDerivation rec { @@ -13,18 +18,28 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; nativeBuildInputs = [ autoreconfHook w3m man ]; - buildInputs = [ zlib pcre ]; + buildInputs = [ zlib pcre mbedtls brotli ]; - makeFlags = [ "STRIP="]; + makeFlags = [ "STRIP=" ]; + configureFlags = [ + "--with-mbedtls" + "--with-brotli" + "--enable-external-filters" + "--enable-compression" + ]; postInstall = '' - rm -rf $out/var + rm -r $out/var ''; + passthru.tests.privoxy = nixosTests.privoxy; + meta = with lib; { homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; - license = licenses.gpl2Plus; + # When linked with mbedtls, the license becomes GPLv3 (or later), otherwise + # GPLv2 (or later). See https://www.privoxy.org/user-manual/copyright.html + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.phreedom ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da00ed76ca874..6036e42168365 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -564,6 +564,7 @@ mapAliases ({ qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 + qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4622497a0f8b1..e0aeeba2b73c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15337,6 +15337,11 @@ in librime = callPackage ../development/libraries/librime {}; + librsb = callPackage ../development/libraries/librsb { + # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec + memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K"; + }; + librtprocess = callPackage ../development/libraries/librtprocess { }; libsamplerate = callPackage ../development/libraries/libsamplerate { @@ -27311,8 +27316,6 @@ in pysolfc = python3Packages.callPackage ../games/pysolfc { }; - qweechat = callPackage ../applications/networking/irc/qweechat { }; - qqwing = callPackage ../games/qqwing { }; quake3wrapper = callPackage ../games/quake3/wrapper { }; |