diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-15 08:17:58 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-06-15 08:17:58 +0200 |
commit | 087b87758e3bfaddf24ff856b8a66b10d8f17050 (patch) | |
tree | 2177825d7875c1dfbf6d2afedda6c0d9d9d9dda2 | |
parent | 788261a1a900d59098e521590cff21c2cefdf4bb (diff) | |
parent | 8c14a6f641b7f3baa57e55e784a0d8626325446b (diff) |
Merge master into staging-next
16 files changed, 138 insertions, 77 deletions
diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 9765a5fa3df7..55d474e5c9db 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -15,6 +15,8 @@ in package = mkOption { type = types.package; default = pkgs.captive-browser; + defaultText = "pkgs.captive-browser"; + description = "Which package to use for captive-browser"; }; interface = mkOption { @@ -35,7 +37,7 @@ in ''http://cache.nixos.org/'' ]; description = '' - the shell (/bin/sh) command executed once the proxy starts. + The shell (/bin/sh) command executed once the proxy starts. When browser exits, the proxy exits. An extra env var PROXY is available. Here, we use a separate Chrome instance in Incognito mode, so that @@ -51,7 +53,7 @@ in dhcp-dns = mkOption { type = types.str; description = '' - the shell (/bin/sh) command executed to obtain the DHCP + The shell (/bin/sh) command executed to obtain the DHCP DNS server address. The first match of an IPv4 regex is used. IPv4 only, because let's be real, it's a captive portal. ''; @@ -62,6 +64,16 @@ in default = "localhost:1666"; description = ''the listen address for the SOCKS5 proxy server''; }; + + bindInterface = mkOption { + default = true; + type = types.bool; + description = '' + Binds <package>captive-browser</package> to the network interface declared in + <literal>cfg.interface</literal>. This can be used to avoid collisions + with private subnets. + ''; + }; }; }; @@ -99,7 +111,9 @@ in browser = """${cfg.browser}""" dhcp-dns = """${cfg.dhcp-dns}""" socks5-addr = """${cfg.socks5-addr}""" - bind-device = """${cfg.interface}""" + ${optionalString cfg.bindInterface '' + bind-device = """${cfg.interface}""" + ''} ''} exec ${cfg.package}/bin/captive-browser ''; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 8499b700d3ea..cf35504e5182 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -186,6 +186,9 @@ let "sockets.target" "sound.target" "systemd-exit.service" + "systemd-tmpfiles-clean.service" + "systemd-tmpfiles-clean.timer" + "systemd-tmpfiles-setup.service" "timers.target" ]; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 46615df2b418..902ff6c389dc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -12,14 +12,14 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "1485maq7rrvi742w0zs5nnaqy2s7w4hhm0fi4n69vafncia8zyic"; - "x86_64-linux" = "082725c7yzih13d4khvwz34ijwdg6yxmsxhjmpn2pqlfsg43hxsh"; - "x86_64-darwin" = "1mvj63sbdcw227bi4idqcwqxds60g64spvdi2bxh5sk6g5q5df90"; + "i686-linux" = "0345pxad3fkcmn5z2r55fnvx8ybvfpwydxv2h21rd99grhwh8dk4"; + "x86_64-linux" = "1g6cib1c9mikg8cv940xk5g8dh0q5v6vlrgj78rr161hz1lrrv09"; + "x86_64-darwin" = "0krihhr57hnsc9qc1l2ncg70vz7nmrvlqrjbgdnihlrpf71d09hp"; }.${system}; in callPackage ./generic.nix rec { - version = "1.35.0"; + version = "1.35.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 7058c00602cc..4d4316e43f72 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -12,17 +12,17 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - "i686-linux" = "1vr3mblg5223k56yqi9fqwa7yg8qi4r3nkw6ssf87gs8jwfxa47l"; - "x86_64-linux" = "1vqq365zw44ll22i06bxxviyywv1v2f71c2mricrz3faz25c3lvm"; - "x86_64-darwin" = "0pa5cz8kq45q375b74kaa8qn1h0r1mp9amh5gsprg3hx89xzvhxi"; + "i686-linux" = "0i572kxc7h63jxl6mw5k3gv08m9padqkky5k1f3w0d638hxhfl23"; + "x86_64-linux" = "0577lqpfrjgwbj27hm59kflb558mkl2nx00ys0hwndayqv0bfnvg"; + "x86_64-darwin" = "047sj0j9k74fvw9fc1ripqk2vy4v17jw488m7r95nf0cyyk08xg0"; }.${system}; in callPackage ./generic.nix rec { - version = "1.34.0"; + version = "1.35.1"; pname = "vscodium"; - executableName = "vscodium"; + executableName = "codium"; longName = "VSCodium"; shortName = "Codium"; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index ba86e08be4fa..d1f4b4d21818 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.20"; + stableVersion = "2.1.21"; previewVersion = "2.2.0b2"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "0hs4qxas8xfwpn8c0w1l89aypqj3dy5wskyis8dq08p6h3kjis1g"; - serverSrcHash = "06q5283mdafijbczd14whw8fqwhmkvvaa9r7q16m18d96mr1z8m5"; + guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3"; + serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index fa7afa2f97f8..5d35da365734 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -7,8 +7,8 @@ let version = "1.7.7"; sha256Hash = "0w3jq02qzpx58xlmwaj0lgav5lx6s9hdidnq9v1npp4qmpdnsn75"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - archPatchesRevision = "476826"; - archPatchesHash = "1vnlvba60hxd5jlh0fvsa50xmb9xgcphdsx6j1ld7f12m7ik68zr"; + archPatchesRevision = "480743"; + archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7"; }; in { stable = mkTelegram stableVersion; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index c76b82ffe6d4..3acfd4bc4001 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -20,7 +20,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.21.0"; + version = "2.22.0"; svn = subversionClient.override { perlBindings = perlSupport; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0a0d0b07rmvs985zpndxxy0vzr0vq53kq5kyd68iv6gf8gkirjwc"; + sha256 = "17zj6jwx3s6bybd290f1mj5iym1r64560rmnf0p63x4akxclp7hm"; }; outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb"; @@ -96,7 +96,9 @@ stdenv.mkDerivation { postBuild = '' make -C contrib/subtree - '' + (stdenv.lib.optionalString stdenv.isDarwin '' + '' + (stdenv.lib.optionalString perlSupport '' + make -C contrib/diff-highlight + '') + (stdenv.lib.optionalString stdenv.isDarwin '' make -C contrib/credential/osxkeychain '') + (stdenv.lib.optionalString withLibsecret '' make -C contrib/credential/libsecret diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index b263b8b187d3..141516015429 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -27,7 +27,7 @@ , # Whetherto build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.7.20190115" +, version ? "8.9.20190601" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -89,14 +89,24 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "c9756dbf1ee58b117ea5c4ded45dea88030efd65"; - sha256 = "0ja3ivyz4jrqkw6z1mdgsczxaqkjy5vw0nyyqlqr0bqxiw9p8834"; + rev = "9bc10993bb300d3712b0f13ec6e28621d75d4204"; + sha256 = "1s7vbinywx8ffj09nxr0h32nggjiqpssrvgmj7820k32w2yi7i8v"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; + patches = [ + (fetchpatch rec { # https://github.com/haskell/haddock/issues/900 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/983.diff"; + name = "loadpluginsinmodules.diff"; + sha256 = "0bvvv0zsfq2581zsir97zfkggc1kkircbbajc2fz3b169ycpbha1"; + extraPrefix = "utils/haddock/"; + stripLen = 1; + }) + ]; + postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 972cbf6a3551..ff0b2bd82241 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -357,6 +357,7 @@ self: super: { pwstore-cli = dontCheck super.pwstore-cli; quantities = dontCheck super.quantities; redis-io = dontCheck super.redis-io; + reflex = dontCheck super.reflex; # test suite uses hlint, which has different haskell-src-exts version rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; safecopy = dontCheck super.safecopy; @@ -1225,7 +1226,7 @@ self: super: { # Use latest pandoc despite what LTS says. # Test suite fails in both 2.5 and 2.6: https://github.com/jgm/pandoc/issues/5309. cmark-gfm = self.cmark-gfm_0_2_0; - pandoc = doDistribute super.pandoc_2_7_3; + pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582 pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; skylighting = self.skylighting_0_8_1_1; skylighting-core = self.skylighting-core_0_8_1_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 013c66461fd9..3044f64e53de 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5571,7 +5571,6 @@ broken-packages: - hharp - HHDL - hhp - - hi-file-parser - hi3status - hiccup - hichi @@ -5986,7 +5985,6 @@ broken-packages: - http-conduit-browser - http-conduit-downloader - http-dispatch - - http-download - http-enumerator - http-grammar - http-kinder @@ -7528,7 +7526,6 @@ broken-packages: - pang-a-lambda - pangraph - panpipe - - pantry-tmp - papa-export - papa-implement - papa-include @@ -8149,7 +8146,6 @@ broken-packages: - refh - refined - reflection-extras - - reflex - reflex-animation - reflex-backend-wai - reflex-basic-host diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5efdd46b15bb..94cd5c4783fa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -79193,20 +79193,20 @@ self: { ({ mkDerivation, async, base, bytestring, containers, data-default , deepseq, directory, exceptions, extensible-effects, filepath , hostname, HUnit, lens, monad-control, mtl, network, parallel - , pretty-types, process, QuickCheck, safe-exceptions, stm, tasty - , tasty-discover, tasty-hunit, text, time, transformers-base + , pretty-types, process, QuickCheck, safe-exceptions, stm, tagged + , tasty, tasty-discover, tasty-hunit, text, time, transformers-base }: mkDerivation { pname = "extensible-effects-concurrent"; - version = "0.25.0"; - sha256 = "135vj952zq4qgs9fsdnkn9rrpkyzkzl5dz6izghyx2i3rfyi7mnf"; + version = "0.25.1"; + sha256 = "0c8569lys8pj432kmwcf30gxaxz2mnrqqpg7blk504fa5zrdxs69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytestring containers data-default deepseq directory exceptions extensible-effects filepath hostname lens monad-control mtl network parallel pretty-types process QuickCheck - safe-exceptions stm text time transformers-base + safe-exceptions stm tagged text time transformers-base ]; executableHaskellDepends = [ base data-default deepseq directory extensible-effects filepath @@ -114865,8 +114865,6 @@ self: { testHaskellDepends = [ base binary bytestring hspec rio vector ]; description = "Parser for GHC's hi files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hi3status" = callPackage @@ -126331,8 +126329,8 @@ self: { pname = "http-download"; version = "0.1.0.0"; sha256 = "0wip7l6cls734ag306s5l0683qqh273b3lk5ibig66racmysjqyb"; - revision = "1"; - editedCabalFile = "10pq9qyw4dfjdw4d95kznjdcishlj42srafgq9a9960rj92w6al4"; + revision = "2"; + editedCabalFile = "0aprl9vnc0i96qbdyjlw5v30aq91nbv65yxd71jca8vbkij3v7iv"; libraryHaskellDepends = [ base base64-bytestring bytestring conduit conduit-extra cryptonite cryptonite-conduit directory exceptions filepath http-client @@ -126346,8 +126344,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Verified downloads with retries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-encodings" = callPackage @@ -147089,8 +147085,8 @@ self: { pname = "linearmap-category"; version = "0.3.5.0"; sha256 = "0qmd0nz343j3j3kprbhwfkglcswfcawfy0y6g4ai6nzdga42nfrf"; - revision = "1"; - editedCabalFile = "15yqlsx8wdp8lxkr8pgr1cfrjpy5v1zsgpi584bcd7szwm76mmsw"; + revision = "2"; + editedCabalFile = "129fgr6m9691cd3nzy1magiwd7f9x2jip96pqj10d0lgb931frzg"; libraryHaskellDepends = [ base call-stack constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups @@ -152588,8 +152584,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.5.0.2"; - sha256 = "073bqcsv09ckgdcpimq2siggh79wf8g070w05jdzmi7pvds9ys2g"; + version = "0.5.0.3"; + sha256 = "12k5h3r6wnqjy5vzia3hypwjrh953cc5n912k1rfdwm4m4pznq03"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -152611,8 +152607,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.2"; - sha256 = "07jv4qvjxc1hhlvy95r3wmb9f4zlifiixjy5vhj7s02lkdpyd7xb"; + version = "0.5.0.3"; + sha256 = "16g0xfs99xcccyngknplgmargz4y4ncfw0wjm7sinjcrfd7js9fb"; libraryHaskellDepends = [ array base binary call-stack comonad constrained-categories containers deepseq free free-vector-spaces ieee754 lens linear @@ -152635,8 +152631,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.2"; - sha256 = "1i2a9nz3v19v155pjhvqwzcsnd9iqv9p28s98ms09fnjb7j1i954"; + version = "0.5.0.3"; + sha256 = "1r459qjbdqygxplv06bnqrysfl0xvmx5i7jkwgah1blpmipr4nwz"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -173366,8 +173362,8 @@ self: { pname = "pantry-tmp"; version = "0.1.0.0"; sha256 = "18b2ac5kb6xzkxa2c5hhl6n37npxcxzxghi0p5wnv5rps3ahsmnn"; - revision = "1"; - editedCabalFile = "1z4daqnrcm0rc10x8vc3x55jw7cyzljh8srkqwa9n7wx7pf312ws"; + revision = "2"; + editedCabalFile = "1zz8cpl55dlfgyhn3g89l1y4hppc3g92y3410i1ahmzcs5pfzmpc"; libraryHaskellDepends = [ aeson ansi-terminal array base base-orphans base64-bytestring bytestring Cabal conduit conduit-extra containers contravariant @@ -173398,8 +173394,6 @@ self: { ]; description = "Content addressable Haskell package management"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "papa" = callPackage @@ -217283,10 +217277,10 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.1.1"; - sha256 = "1cx4j171813ab7x8k1ydgm17cz7481wlgqgqgs9bqqm4x1i8l4lk"; - revision = "2"; - editedCabalFile = "0qjpq9knshlqll3wymx8ny8xmf1mbfbyzx1lbbrqm7yzgky3kv49"; + version = "2.1.1.1"; + sha256 = "1qqy0hkcvr4nblpknwljc71hck8ccpdiqxbxhj5mjwp9ybvag1j2"; + revision = "1"; + editedCabalFile = "1wn8lh8qxzj9rqvv1584gqz6rq33nkn1944ry7kpfsvwjl40vhkc"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 05d78488957a..8334bf195f7b 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,33 +1,49 @@ -{stdenv, fetchurl, libGLU_combined, tcl, tk, file, libXmu, cmake, libtool, qt4, -ftgl, freetype}: +{ stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, + pkgconfig, fontconfig, freetype, expat, freeimage, vtk }: stdenv.mkDerivation rec { - name = "opencascade-oce-0.18.3"; - src = fetchurl { - url = https://github.com/tpaviot/oce/archive/OCE-0.18.3.tar.gz; - sha256 = "0v4ny0qhr5hiialb2ss25bllfnd6j4g7mfxnqfmr1xsjpykxcly5"; + pname = "opencascade-oce"; + version = "0.18.3"; + + src = fetchFromGitHub { + owner = "tpaviot"; + repo = "oce"; + rev = "OCE-${version}"; + sha256 = "17wy8dcf44vqisishv1jjf3cmcxyygqq29y9c3wjdj983qi2hsig"; }; - buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; + nativeBuildInputs = [ cmake ninja pkgconfig ]; + buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ]; - # Fix for glibc 2.26 - postPatch = '' - sed -i -e 's/^\( *#include <\)x\(locale.h>\)//' \ - src/Standard/Standard_CLocaleSentry.hxx - ''; + cmakeFlags = [ + "-DOCE_INSTALL_PREFIX=${placeholder "out"}" + "-DOCE_WITH_FREEIMAGE=ON" + "-DOCE_WITH_VTK=ON" + ]; - preConfigure = '' - cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" - ''; + patches = [ + # Use fontconfig instead of hardcoded directory list + # https://github.com/tpaviot/oce/pull/714 + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/9643432b27fec8974ca0ee15c3c372f5fe8fc069.patch"; + sha256 = "1wd940rszmh5apcpk5fv6126h8mcjcy4rjifrql5d4ac90v06v4c"; + }) + # Fix for glibc 2.26 + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; + sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; + }) + ]; - # https://bugs.freedesktop.org/show_bug.cgi?id=83631 - NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY"; - - enableParallelBuilding = true; + postPatch = '' + # make sure the installed cmake file uses absolute paths for fontconfig + substituteInPlace adm/cmake/TKService/CMakeLists.txt \ + --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES + ''; meta = with stdenv.lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; - homepage = http://www.opencascade.org/; + homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e571c72232c7..3ecd81d39f99 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -258,7 +258,7 @@ let Formula = [ pkgs.gmp ]; geoCount = [ pkgs.gsl_1 ]; gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; - git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev ]; + git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ]; GLAD = [ pkgs.gsl_1 ]; glpkAPI = [ pkgs.gmp pkgs.glpk ]; gmp = [ pkgs.gmp.dev ]; diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 15470479a3a2..f72b3cac7371 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -28,7 +28,9 @@ in stdenv.mkDerivation rec { url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; }) - ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch; + ++ (if isFuse3 + then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ] + else [ ./fuse2-Do-not-set-FUSERMOUNT_DIR.patch ]); nativeBuildInputs = if isFuse3 then [ meson ninja pkgconfig ] diff --git a/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch new file mode 100644 index 000000000000..8ff40f34f938 --- /dev/null +++ b/pkgs/os-specific/linux/fuse/fuse2-Do-not-set-FUSERMOUNT_DIR.patch @@ -0,0 +1,11 @@ +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + + AUTOMAKE_OPTIONS = subdir-objects +-AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \ ++AM_CPPFLAGS = -I$(top_srcdir)/include \ + -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26 + + lib_LTLIBRARIES = libfuse.la libulockmgr.la diff --git a/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch new file mode 100644 index 000000000000..1d41a26b0a4d --- /dev/null +++ b/pkgs/os-specific/linux/fuse/fuse3-Do-not-set-FUSERMOUNT_DIR.patch @@ -0,0 +1,12 @@ +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(), + soversion: '3', include_directories: include_dirs, + dependencies: deps, install: true, + link_depends: 'fuse_versionscript', +- c_args: [ '-DFUSE_USE_VERSION=34', +- '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ], ++ c_args: [ '-DFUSE_USE_VERSION=34' ], + link_args: ['-Wl,--version-script,' + meson.current_source_dir() + + '/fuse_versionscript' ]) + |