Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 49299f66 f0d5e4f5

+488 -413
+2 -1
nixos/tests/airsonic.nix
··· 15 15 16 16 testScript = '' 17 17 def airsonic_is_up(_) -> bool: 18 - return machine.succeed("curl --fail http://localhost:4040/login") 18 + status, _ = machine.execute("curl --fail http://localhost:4040/login") 19 + return status == 0 19 20 20 21 21 22 machine.start()
+3
pkgs/applications/audio/in-formant/default.nix
··· 35 35 cp in-formant $out/bin 36 36 ''; 37 37 38 + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ 39 + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; 40 + 38 41 meta = with lib; { 39 42 description = "A real-time pitch and formant tracking software"; 40 43 homepage = "https://github.com/in-formant/in-formant";
+37 -41
pkgs/applications/audio/moc/default.nix
··· 24 24 , withDebug ? false 25 25 }: 26 26 27 - let 28 - opt = lib.optional; 29 - mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; 30 - 31 - in stdenv.mkDerivation rec { 27 + stdenv.mkDerivation rec { 32 28 33 29 pname = "moc"; 34 30 version = "2.5.2"; ··· 39 35 }; 40 36 41 37 patches = [] 42 - ++ opt ffmpegSupport ./moc-ffmpeg4.patch 43 - ++ opt pulseSupport ./pulseaudio.patch; 38 + ++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch 39 + ++ lib.optional pulseSupport ./pulseaudio.patch; 44 40 45 41 nativeBuildInputs = [ pkg-config ] 46 - ++ opt pulseSupport autoreconfHook; 42 + ++ lib.optional pulseSupport autoreconfHook; 47 43 48 44 buildInputs = [ ncurses db popt libtool ] 49 45 # Sound sub-systems 50 - ++ opt alsaSupport alsa-lib 51 - ++ opt pulseSupport libpulseaudio 52 - ++ opt jackSupport libjack2 46 + ++ lib.optional alsaSupport alsa-lib 47 + ++ lib.optional pulseSupport libpulseaudio 48 + ++ lib.optional jackSupport libjack2 53 49 # Audio formats 54 - ++ opt (aacSupport || mp3Support) libid3tag 55 - ++ opt aacSupport faad2 56 - ++ opt flacSupport flac 57 - ++ opt midiSupport timidity 58 - ++ opt modplugSupport libmodplug 59 - ++ opt mp3Support libmad 50 + ++ lib.optional (aacSupport || mp3Support) libid3tag 51 + ++ lib.optional aacSupport faad2 52 + ++ lib.optional flacSupport flac 53 + ++ lib.optional midiSupport timidity 54 + ++ lib.optional modplugSupport libmodplug 55 + ++ lib.optional mp3Support libmad 60 56 ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] 61 - ++ opt vorbisSupport libvorbis 62 - ++ opt speexSupport speex 63 - ++ opt ffmpegSupport ffmpeg 64 - ++ opt sndfileSupport libsndfile 65 - ++ opt wavpackSupport wavpack 57 + ++ lib.optional vorbisSupport libvorbis 58 + ++ lib.optional speexSupport speex 59 + ++ lib.optional ffmpegSupport ffmpeg 60 + ++ lib.optional sndfileSupport libsndfile 61 + ++ lib.optional wavpackSupport wavpack 66 62 # Misc 67 - ++ opt curlSupport curl 68 - ++ opt samplerateSupport libsamplerate 63 + ++ lib.optional curlSupport curl 64 + ++ lib.optional samplerateSupport libsamplerate 69 65 ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; 70 66 71 67 configureFlags = [ 72 68 # Sound sub-systems 73 - (mkFlag alsaSupport "alsa") 74 - (mkFlag pulseSupport "pulse") 75 - (mkFlag jackSupport "jack") 76 - (mkFlag ossSupport "oss") 69 + (lib.withFeature alsaSupport "alsa") 70 + (lib.withFeature pulseSupport "pulse") 71 + (lib.withFeature jackSupport "jack") 72 + (lib.withFeature ossSupport "oss") 77 73 # Audio formats 78 - (mkFlag aacSupport "aac") 79 - (mkFlag flacSupport "flac") 80 - (mkFlag midiSupport "timidity") 81 - (mkFlag modplugSupport "modplug") 82 - (mkFlag mp3Support "mp3") 83 - (mkFlag musepackSupport "musepack") 84 - (mkFlag vorbisSupport "vorbis") 85 - (mkFlag speexSupport "speex") 86 - (mkFlag ffmpegSupport "ffmpeg") 87 - (mkFlag sndfileSupport "sndfile") 88 - (mkFlag wavpackSupport "wavpack") 74 + (lib.withFeature aacSupport "aac") 75 + (lib.withFeature flacSupport "flac") 76 + (lib.withFeature midiSupport "timidity") 77 + (lib.withFeature modplugSupport "modplug") 78 + (lib.withFeature mp3Support "mp3") 79 + (lib.withFeature musepackSupport "musepack") 80 + (lib.withFeature vorbisSupport "vorbis") 81 + (lib.withFeature speexSupport "speex") 82 + (lib.withFeature ffmpegSupport "ffmpeg") 83 + (lib.withFeature sndfileSupport "sndfile") 84 + (lib.withFeature wavpackSupport "wavpack") 89 85 # Misc 90 - (mkFlag curlSupport "curl") 91 - (mkFlag samplerateSupport "samplerate") 86 + (lib.withFeature curlSupport "curl") 87 + (lib.withFeature samplerateSupport "samplerate") 92 88 ("--enable-debug=" + (if withDebug then "yes" else "no")) 93 89 "--disable-cache" 94 90 "--without-rcc"
+2 -2
pkgs/applications/audio/ptcollab/default.nix
··· 13 13 14 14 mkDerivation rec { 15 15 pname = "ptcollab"; 16 - version = "0.6.1.0"; 16 + version = "0.6.1.1"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "yuxshao"; 20 20 repo = "ptcollab"; 21 21 rev = "v${version}"; 22 - sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw="; 22 + sha256 = "sha256-ydn3qKOK0GwA/mBPbGwSIac09b9cz6YOFbuDFFV8jJs="; 23 23 }; 24 24 25 25 nativeBuildInputs = [ qmake pkg-config ];
+2 -2
pkgs/applications/editors/cudatext/default.nix
··· 38 38 in 39 39 stdenv.mkDerivation rec { 40 40 pname = "cudatext"; 41 - version = "1.166.5"; 41 + version = "1.167.0"; 42 42 43 43 src = fetchFromGitHub { 44 44 owner = "Alexey-T"; 45 45 repo = "CudaText"; 46 46 rev = version; 47 - sha256 = "sha256-mFSVYC6a9iAiUcWZOlxuVxFwuwIgH8eQmh8YKaMw2Wg="; 47 + sha256 = "sha256-cK96lcncSojEcQrZIPiJ9j9F4cIcaXvWNI9wuR3tVBU="; 48 48 }; 49 49 50 50 postPatch = ''
+4 -4
pkgs/applications/editors/cudatext/deps.json
··· 11 11 }, 12 12 "ATFlatControls": { 13 13 "owner": "Alexey-T", 14 - "rev": "2022.06.19", 15 - "sha256": "sha256-4pkwgg2U6NAGv+fVFKIli2Qe3fyDMiliFLJSgsh1hsQ=" 14 + "rev": "2022.07.17", 15 + "sha256": "sha256-KMGmimbtUQHa8i5wt4KLA/HotLbb/ISzdznmdqPXkNU=" 16 16 }, 17 17 "ATSynEdit": { 18 18 "owner": "Alexey-T", 19 - "rev": "2022.07.01", 20 - "sha256": "sha256-Il8NMBoShJtY5itDr9EBJ8NpfiPux/pNzs9LUc/nn30=" 19 + "rev": "2022.07.18", 20 + "sha256": "sha256-3ae1XAGu+4p+EVReH7VZZOTOwOu5juybPXjK7XN16CQ=" 21 21 }, 22 22 "ATSynEdit_Cmp": { 23 23 "owner": "Alexey-T",
+3 -3
pkgs/applications/misc/break-time/default.nix
··· 11 11 12 12 rustPlatform.buildRustPackage rec { 13 13 pname = "break-time"; 14 - version = "0.1.1"; 14 + version = "0.1.2"; 15 15 16 16 src = fetchFromGitHub { 17 17 owner = "cdepillabout"; 18 18 repo = "break-time"; 19 19 rev = "v${version}"; 20 - sha256 = "18p9gfp0inbnjsc7af38fghyklr7qnl2kkr25isfy9d5m8cpxqc6"; 20 + sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8="; 21 21 }; 22 22 23 - cargoSha256 = "01y1p40vz30h2jkh37zipqvmfybgpq6wdcdglkab85jivmd1lslx"; 23 + cargoSha256 = "sha256-DpX5tcIWt/pPGujufivmAGonVIiHERfa8Yb1JZpu3WA="; 24 24 25 25 nativeBuildInputs = [ 26 26 pkg-config
+3 -3
pkgs/applications/networking/cluster/k9s/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "k9s"; 5 - version = "0.25.21"; 5 + version = "0.26.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "derailed"; 9 9 repo = "k9s"; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-ziIMTMK6G8vXje6GWPvcIWmlubq75XVrJUzZlA+R0Rc="; 11 + sha256 = "sha256-6A6RxvobT0T/Pbd7Zcn8++I/7OVAhXSZI1NhYeDB3iY="; 12 12 }; 13 13 14 14 ldflags = [ ··· 20 20 21 21 tags = [ "netgo" ]; 22 22 23 - vendorSha256 = "sha256-wL8Unht/ZRAGDuC/U4SFV5PdExy78F4DMyM8+7CMtOY="; 23 + vendorSha256 = "sha256-1FmhoLfTQSygAScbvABHZJO3611T7cfuCboyu2ShbNo="; 24 24 25 25 # TODO investigate why some config tests are failing 26 26 doCheck = !(stdenv.isDarwin && stdenv.isAarch64);
+3 -3
pkgs/applications/networking/cluster/werf/default.nix
··· 10 10 11 11 buildGoModule rec { 12 12 pname = "werf"; 13 - version = "1.2.124"; 13 + version = "1.2.128"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "werf"; 17 17 repo = "werf"; 18 18 rev = "v${version}"; 19 - sha256 = "sha256-fdCFdsRMdH9xu2YIYt6r7BxqbdzrzUxLxB1k4WEnGIo="; 19 + sha256 = "sha256-H1GzIxj6ZrlcNM4Y0oKYoVBsMFj4wYP9XYicAmIpaik="; 20 20 }; 21 21 22 - vendorSha256 = "sha256-AbTlchqVD3TySrcHcF3/QfMhbkNg4A4oef9Qkn2v6xY="; 22 + vendorSha256 = "sha256-78V+cw0A3Q3Gagl4KrserFXvV17MSqhpaFG38VKwhKg="; 23 23 24 24 proxyVendor = true; 25 25
+4 -5
pkgs/applications/networking/pcloud/default.nix
··· 26 26 27 27 let 28 28 pname = "pcloud"; 29 - version = "1.9.7"; 30 - code = "XZ0FAtXZNxFJbda6KhLejU9tKAg4N0TEqx3V"; 31 - 32 - # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive 29 + version = "1.9.9"; 30 + code = "XZWTVkVZQM0GNXA4hrFGPkefzUUWVLKOpPIX"; 31 + # Archive link's codes: https://www.pcloud.com/release-notes/linux.html 33 32 src = fetchzip { 34 33 url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; 35 - hash = "sha256-6eMRFuZOLcoZd2hGw7QV+kAmzE5lK8uK6ZpGs4n7/zw="; 34 + hash = "sha256-8566vKrE3/QCm4qW9KxEAO+r+YfMRYOhV2Da7qic48M="; 36 35 }; 37 36 38 37 appimageContents = appimageTools.extractType2 {
+5
pkgs/applications/science/misc/simgrid/default.nix
··· 76 76 patchShebangs .. 77 77 ''; 78 78 79 + # needed by tests (so libsimgrid.so is found) 80 + preConfigure = '' 81 + export LD_LIBRARY_PATH="$PWD/build/lib" 82 + ''; 83 + 79 84 doCheck = true; 80 85 preCheck = '' 81 86 # prevent the execution of tests known to fail
+4 -1
pkgs/applications/video/ccextractor/default.nix
··· 36 36 ++ lib.optional (!stdenv.isLinux) libiconv 37 37 ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; 38 38 39 - cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; 39 + cmakeFlags = [ 40 + # file RPATH_CHANGE could not write new RPATH: 41 + "-DCMAKE_SKIP_BUILD_RPATH=ON" 42 + ] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; 40 43 41 44 postInstall = lib.optionalString enableOcr '' 42 45 wrapProgram "$out/bin/ccextractor" \
+6
pkgs/development/libraries/galario/default.nix
··· 49 49 ''; 50 50 51 51 preCheck = '' 52 + ${if stdenv.isDarwin then "export DYLD_LIBRARY_PATH=$(pwd)/src/" else "export LD_LIBRARY_PATH=$(pwd)/src/"} 52 53 ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} 53 54 ''; 55 + 56 + cmakeFlags = lib.optionals enablePython [ 57 + # RPATH of binary /nix/store/.../lib/python3.10/site-packages/galario/double/libcommon.so contains a forbidden reference to /build/ 58 + "-DCMAKE_SKIP_BUILD_RPATH=ON" 59 + ]; 54 60 55 61 doCheck = true; 56 62
+9 -13
pkgs/development/libraries/lame/default.nix
··· 11 11 , debugSupport ? false # Debugging (disables optimizations) 12 12 }: 13 13 14 - let 15 - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; 16 - in 17 - 18 14 with lib; 19 15 stdenv.mkDerivation rec { 20 16 pname = "lame"; ··· 37 33 ++ optional sndfileFileIOSupport libsndfile; 38 34 39 35 configureFlags = [ 40 - (mkFlag nasmSupport "nasm") 41 - (mkFlag cpmlSupport "cpml") 42 - #(mkFlag efenceSupport "efence") 36 + (enableFeature nasmSupport "nasm") 37 + (enableFeature cpmlSupport "cpml") 38 + #(enableFeature efenceSupport "efence") 43 39 (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") 44 - (mkFlag analyzerHooksSupport "analyzer-hooks") 45 - (mkFlag decoderSupport "decoder") 46 - (mkFlag frontendSupport "frontend") 47 - (mkFlag frontendSupport "dynamic-frontends") 48 - #(mkFlag mp3xSupport "mp3x") 49 - (mkFlag mp3rtpSupport "mp3rtp") 40 + (enableFeature analyzerHooksSupport "analyzer-hooks") 41 + (enableFeature decoderSupport "decoder") 42 + (enableFeature frontendSupport "frontend") 43 + (enableFeature frontendSupport "dynamic-frontends") 44 + #(enableFeature mp3xSupport "mp3x") 45 + (enableFeature mp3rtpSupport "mp3rtp") 50 46 (if debugSupport then "--enable-debug=alot" else "") 51 47 ]; 52 48
+3 -7
pkgs/development/libraries/libass/default.nix
··· 8 8 9 9 assert fontconfigSupport -> fontconfig != null; 10 10 11 - let 12 - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; 13 - in 14 - 15 11 with lib; 16 12 stdenv.mkDerivation rec { 17 13 pname = "libass"; ··· 23 19 }; 24 20 25 21 configureFlags = [ 26 - (mkFlag fontconfigSupport "fontconfig") 27 - (mkFlag rasterizerSupport "rasterizer") 28 - (mkFlag largeTilesSupport "large-tiles") 22 + (enableFeature fontconfigSupport "fontconfig") 23 + (enableFeature rasterizerSupport "rasterizer") 24 + (enableFeature largeTilesSupport "large-tiles") 29 25 ]; 30 26 31 27 nativeBuildInputs = [ pkg-config yasm ];
+7 -9
pkgs/development/libraries/libinfinity/default.nix
··· 9 9 assert gtkWidgets -> gtk3 != null; 10 10 11 11 let 12 - mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; 13 - 14 12 self = stdenv.mkDerivation rec { 15 13 pname = "libinfinity"; 16 14 version = "0.7.2"; ··· 29 27 propagatedBuildInputs = [ gnutls ]; 30 28 31 29 configureFlags = [ 32 - "--enable-gtk-doc" 33 - "--enable-introspection" 34 - (mkFlag gtkWidgets "inftextgtk") 35 - (mkFlag gtkWidgets "infgtk") 36 - "--with-infinoted" 37 - "--with-libdaemon" 38 - (mkFlag avahiSupport "avahi") 30 + (lib.enableFeature true "gtk-doc") 31 + (lib.enableFeature true "introspection") 32 + (lib.withFeature gtkWidgets "inftextgtk") 33 + (lib.withFeature gtkWidgets "infgtk") 34 + (lib.withFeature true "infinoted") 35 + (lib.withFeature true "libdaemon") 36 + (lib.withFeature avahiSupport "avahi") 39 37 ]; 40 38 41 39 passthru = {
+36
pkgs/development/libraries/physics/clhep/default.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , cmake 5 + }: 6 + 7 + stdenv.mkDerivation rec { 8 + pname = "clhep"; 9 + version = "2.4.5.3"; 10 + 11 + src = fetchurl { 12 + url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; 13 + hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM="; 14 + }; 15 + 16 + prePatch = '' 17 + cd CLHEP 18 + ''; 19 + 20 + postPatch = '' 21 + substituteInPlace CMakeLists.txt \ 22 + --replace "clhep_ensure_out_of_source_build()" "" 23 + ''; 24 + 25 + nativeBuildInputs = [ 26 + cmake 27 + ]; 28 + 29 + meta = with lib; { 30 + description = "Set of HEP-specific foundation and utility classes such as random generators, physics vectors, geometry and linear algebra"; 31 + homepage = "https://cern.ch/clhep"; 32 + license = with licenses; [ gpl3Only lgpl3Only ]; 33 + maintainers = with maintainers; [ veprbl ]; 34 + platforms = platforms.unix; 35 + }; 36 + }
+4 -4
pkgs/development/libraries/physics/geant4/default.nix
··· 10 10 # Standard build environment with cmake. 11 11 , lib, stdenv, fetchurl, fetchpatch, cmake 12 12 13 - , clhep ? null # not packaged currently 13 + , clhep 14 14 , expat 15 15 , xercesc 16 16 , zlib ··· 65 65 "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" 66 66 "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}" 67 67 "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" 68 - "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" 68 + "-DGEANT4_USE_SYSTEM_CLHEP=ON" 69 69 "-DGEANT4_USE_SYSTEM_EXPAT=ON" 70 70 "-DGEANT4_USE_SYSTEM_ZLIB=ON" 71 71 "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" ··· 88 88 ]; 89 89 dontWrapQtApps = true; # no binaries 90 90 91 - buildInputs = [ libGLU xlibsWrapper libXmu ] 91 + buildInputs = [ clhep libGLU xlibsWrapper libXmu ] 92 92 ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] 93 93 ++ lib.optionals enablePython [ boost_python python3 ]; 94 94 95 - propagatedBuildInputs = [ clhep expat xercesc zlib libGL ] 95 + propagatedBuildInputs = [ expat xercesc zlib libGL ] 96 96 ++ lib.optionals enableXM [ motif ] 97 97 ++ lib.optionals enableQt [ qtbase ]; 98 98
+13 -20
pkgs/development/libraries/wiredtiger/default.nix
··· 7 7 8 8 with lib; 9 9 let 10 - mkFlag = trueStr: falseStr: cond: name: val: "--" 11 - + (if cond then trueStr else falseStr) 12 - + name 13 - + optionalString (val != null && cond != false) "=${val}"; 14 - mkEnable = mkFlag "enable-" "disable-"; 15 - mkWith = mkFlag "with-" "without-"; 16 - 17 10 shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; 18 11 19 12 optLz4 = shouldUsePkg lz4; ··· 39 32 buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; 40 33 41 34 configureFlags = [ 42 - (mkWith false "attach" null) 43 - (mkWith true "builtins" "") 44 - (mkEnable (optBzip2 != null) "bzip2" null) 45 - (mkEnable false "diagnostic" null) 46 - (mkEnable false "java" null) 47 - (mkEnable (optLeveldb != null) "leveldb" null) 48 - (mkEnable false "python" null) 49 - (mkEnable (optSnappy != null) "snappy" null) 50 - (mkEnable (optLz4 != null) "lz4" null) 51 - (mkEnable (optGperftools != null) "tcmalloc" null) 52 - (mkEnable (optZlib != null) "zlib" null) 53 - (mkWith (optDb != null) "berkeleydb" optDb) 54 - (mkWith false "helium" null) 35 + (withFeature false "attach") 36 + (withFeatureAs true "builtins" "") 37 + (enableFeature (optBzip2 != null) "bzip2") 38 + (enableFeature false "diagnostic") 39 + (enableFeature false "java") 40 + (enableFeature (optLeveldb != null) "leveldb") 41 + (enableFeature false "python") 42 + (enableFeature (optSnappy != null) "snappy") 43 + (enableFeature (optLz4 != null) "lz4") 44 + (enableFeature (optGperftools != null) "tcmalloc") 45 + (enableFeature (optZlib != null) "zlib") 46 + (withFeatureAs (optDb != null) "berkeleydb" optDb) 47 + (withFeature false "helium") 55 48 ]; 56 49 57 50 preConfigure = ''
+2 -2
pkgs/development/python-modules/textx/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 - , python3 3 + , python 4 4 , fetchFromGitHub 5 5 , mkdocs 6 6 , twine ··· 53 53 54 54 postInstall = '' 55 55 # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx 56 - cp "$src/textx/textx.tx" "$out/${python3.sitePackages}/${pname}/" 56 + cp "$src/textx/textx.tx" "$out/lib/${python.libPrefix}/site-packages/${pname}/" 57 57 58 58 # Install tests as the tests output. 59 59 mkdir $testout
+2 -1
pkgs/development/python-modules/treex/default.nix
··· 34 34 postPatch = '' 35 35 substituteInPlace pyproject.toml \ 36 36 --replace 'rich = "^11.2.0"' 'rich = "*"' \ 37 - --replace 'treeo = "^0.0.10"' 'treeo = "*"' 37 + --replace 'treeo = "^0.0.10"' 'treeo = "*"' \ 38 + --replace 'certifi = "^2021.10.8"' 'certifi = "*"' 38 39 ''; 39 40 40 41 nativeBuildInputs = [
+2
pkgs/development/tools/qtcreator/default.nix
··· 9 9 # Fetch clang from qt vendor, this contains submodules like this: 10 10 # clang<-clang-tools-extra<-clazy. 11 11 clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { 12 + # file RPATH_CHANGE could not write new RPATH 13 + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; 12 14 src = fetchgit { 13 15 url = "https://code.qt.io/clang/clang.git"; 14 16 rev = "c12b012bb7465299490cf93c2ae90499a5c417d5";
+2 -2
pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix
··· 2 2 3 3 buildPythonPackage rec { 4 4 pname = "matrix-synapse-mjolnir-antispam"; 5 - version = "1.4.2"; 5 + version = "1.5.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "matrix-org"; 9 9 repo = "mjolnir"; 10 10 rev = "refs/tags/v${version}"; 11 - sha256 = "sha256-887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM="; 11 + sha256 = "sha256-YmP+r9W5e63Aw66lSQeTTbYwSF/vjPyHkoehJxtcRNw="; 12 12 }; 13 13 14 14 sourceRoot = "./source/synapse_antispam";
+2 -2
pkgs/servers/mjolnir/default.nix
··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "mjolnir"; 12 - version = "1.4.2"; 12 + version = "1.5.0"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "matrix-org"; 16 16 repo = "mjolnir"; 17 17 rev = "v${version}"; 18 - sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM="; 18 + sha256 = "YmP+r9W5e63Aw66lSQeTTbYwSF/vjPyHkoehJxtcRNw="; 19 19 }; 20 20 21 21 nativeBuildInputs = [
+154 -154
pkgs/servers/mjolnir/node-deps.nix
··· 13 13 sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; 14 14 }; 15 15 }; 16 - "@babel/code-frame-7.16.7" = { 16 + "@babel/code-frame-7.18.6" = { 17 17 name = "_at_babel_slash_code-frame"; 18 18 packageName = "@babel/code-frame"; 19 - version = "7.16.7"; 19 + version = "7.18.6"; 20 20 src = fetchurl { 21 - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; 22 - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; 21 + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; 22 + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; 23 23 }; 24 24 }; 25 - "@babel/helper-validator-identifier-7.16.7" = { 25 + "@babel/helper-validator-identifier-7.18.6" = { 26 26 name = "_at_babel_slash_helper-validator-identifier"; 27 27 packageName = "@babel/helper-validator-identifier"; 28 - version = "7.16.7"; 28 + version = "7.18.6"; 29 29 src = fetchurl { 30 - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; 31 - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; 30 + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; 31 + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; 32 32 }; 33 33 }; 34 - "@babel/highlight-7.17.9" = { 34 + "@babel/highlight-7.18.6" = { 35 35 name = "_at_babel_slash_highlight"; 36 36 packageName = "@babel/highlight"; 37 - version = "7.17.9"; 37 + version = "7.18.6"; 38 38 src = fetchurl { 39 - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz"; 40 - sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; 39 + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; 40 + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; 41 41 }; 42 42 }; 43 43 "@eslint/eslintrc-0.4.3" = { ··· 139 139 sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; 140 140 }; 141 141 }; 142 - "@types/express-serve-static-core-4.17.28" = { 142 + "@types/express-serve-static-core-4.17.29" = { 143 143 name = "_at_types_slash_express-serve-static-core"; 144 144 packageName = "@types/express-serve-static-core"; 145 - version = "4.17.28"; 145 + version = "4.17.29"; 146 146 src = fetchurl { 147 - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; 148 - sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; 147 + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz"; 148 + sha512 = "uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q=="; 149 149 }; 150 150 }; 151 151 "@types/html-to-text-8.1.0" = { ··· 229 229 sha512 = "Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw=="; 230 230 }; 231 231 }; 232 - "@types/node-16.11.35" = { 232 + "@types/node-16.11.45" = { 233 233 name = "_at_types_slash_node"; 234 234 packageName = "@types/node"; 235 - version = "16.11.35"; 235 + version = "16.11.45"; 236 236 src = fetchurl { 237 - url = "https://registry.npmjs.org/@types/node/-/node-16.11.35.tgz"; 238 - sha512 = "QXu45LyepgnhUfnIAj/FyT4uM87ug5KpIrgXfQtUPNAlx8w5hmd8z8emqCLNvG11QkpRSCG9Qg2buMxvqfjfsQ=="; 237 + url = "https://registry.npmjs.org/@types/node/-/node-16.11.45.tgz"; 238 + sha512 = "3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ=="; 239 239 }; 240 240 }; 241 241 "@types/parse5-6.0.3" = { ··· 427 427 sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; 428 428 }; 429 429 }; 430 - "ansi-colors-4.1.2" = { 430 + "ansi-colors-4.1.3" = { 431 431 name = "ansi-colors"; 432 432 packageName = "ansi-colors"; 433 - version = "4.1.2"; 433 + version = "4.1.3"; 434 434 src = fetchurl { 435 - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.2.tgz"; 436 - sha512 = "cEG18jjLG0O74o/33eEfnmtXYDEY196ZjL0eQEISULF+Imi7vr25l6ntGYmqS5lIrQIEeze+CqUtPVItywE7ZQ=="; 435 + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"; 436 + sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="; 437 437 }; 438 438 }; 439 439 "ansi-regex-5.0.1" = { ··· 784 784 version = "1.1.3"; 785 785 src = fetchurl { 786 786 url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; 787 - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; 787 + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; 788 788 }; 789 789 }; 790 790 "color-name-1.1.4" = { ··· 829 829 version = "0.0.1"; 830 830 src = fetchurl { 831 831 url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; 832 - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; 832 + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; 833 833 }; 834 834 }; 835 835 "config-3.3.7" = { ··· 874 874 version = "1.0.6"; 875 875 src = fetchurl { 876 876 url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; 877 - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; 877 + sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; 878 878 }; 879 879 }; 880 880 "core-util-is-1.0.2" = { ··· 883 883 version = "1.0.2"; 884 884 src = fetchurl { 885 885 url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; 886 - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; 886 + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; 887 887 }; 888 888 }; 889 889 "cross-spawn-7.0.3" = { ··· 937 937 version = "1.14.1"; 938 938 src = fetchurl { 939 939 url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; 940 - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; 940 + sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; 941 941 }; 942 942 }; 943 943 "data-urls-2.0.0" = { ··· 1018 1018 version = "1.0.0"; 1019 1019 src = fetchurl { 1020 1020 url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; 1021 - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; 1021 + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; 1022 1022 }; 1023 1023 }; 1024 1024 "depd-2.0.0" = { ··· 1081 1081 version = "1.0.0"; 1082 1082 src = fetchurl { 1083 1083 url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; 1084 - sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; 1084 + sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; 1085 1085 }; 1086 1086 }; 1087 1087 "doctrine-3.0.0" = { ··· 1153 1153 version = "0.1.2"; 1154 1154 src = fetchurl { 1155 1155 url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; 1156 - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; 1156 + sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; 1157 1157 }; 1158 1158 }; 1159 1159 "editorconfig-0.15.3" = { ··· 1171 1171 version = "1.1.1"; 1172 1172 src = fetchurl { 1173 1173 url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; 1174 - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; 1174 + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; 1175 1175 }; 1176 1176 }; 1177 1177 "emoji-regex-8.0.0" = { ··· 1189 1189 version = "1.0.2"; 1190 1190 src = fetchurl { 1191 1191 url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; 1192 - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; 1192 + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; 1193 1193 }; 1194 1194 }; 1195 1195 "enquirer-2.3.6" = { ··· 1225 1225 version = "1.0.3"; 1226 1226 src = fetchurl { 1227 1227 url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; 1228 - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; 1228 + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; 1229 1229 }; 1230 1230 }; 1231 1231 "escape-string-regexp-1.0.5" = { ··· 1234 1234 version = "1.0.5"; 1235 1235 src = fetchurl { 1236 1236 url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; 1237 - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; 1237 + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; 1238 1238 }; 1239 1239 }; 1240 1240 "escape-string-regexp-2.0.0" = { ··· 1378 1378 version = "1.8.1"; 1379 1379 src = fetchurl { 1380 1380 url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; 1381 - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; 1381 + sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; 1382 1382 }; 1383 1383 }; 1384 1384 "expect-27.5.1" = { ··· 1414 1414 version = "1.3.0"; 1415 1415 src = fetchurl { 1416 1416 url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; 1417 - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; 1417 + sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; 1418 1418 }; 1419 1419 }; 1420 1420 "fast-deep-equal-3.1.3" = { ··· 1441 1441 version = "2.0.6"; 1442 1442 src = fetchurl { 1443 1443 url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; 1444 - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; 1444 + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; 1445 1445 }; 1446 1446 }; 1447 1447 "file-entry-cache-6.0.1" = { ··· 1498 1498 sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; 1499 1499 }; 1500 1500 }; 1501 - "flatted-3.2.5" = { 1501 + "flatted-3.2.6" = { 1502 1502 name = "flatted"; 1503 1503 packageName = "flatted"; 1504 - version = "3.2.5"; 1504 + version = "3.2.6"; 1505 1505 src = fetchurl { 1506 - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; 1507 - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; 1506 + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"; 1507 + sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="; 1508 1508 }; 1509 1509 }; 1510 1510 "forever-agent-0.6.1" = { ··· 1513 1513 version = "0.6.1"; 1514 1514 src = fetchurl { 1515 1515 url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; 1516 - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; 1516 + sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; 1517 1517 }; 1518 1518 }; 1519 1519 "form-data-2.3.3" = { ··· 1549 1549 version = "0.5.2"; 1550 1550 src = fetchurl { 1551 1551 url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; 1552 - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; 1552 + sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; 1553 1553 }; 1554 1554 }; 1555 1555 "fs.realpath-1.0.0" = { ··· 1558 1558 version = "1.0.0"; 1559 1559 src = fetchurl { 1560 1560 url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; 1561 - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; 1561 + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; 1562 1562 }; 1563 1563 }; 1564 1564 "fsevents-2.3.2" = { ··· 1585 1585 version = "1.0.1"; 1586 1586 src = fetchurl { 1587 1587 url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; 1588 - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; 1588 + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; 1589 1589 }; 1590 1590 }; 1591 1591 "get-caller-file-2.0.5" = { ··· 1597 1597 sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; 1598 1598 }; 1599 1599 }; 1600 - "get-intrinsic-1.1.1" = { 1600 + "get-intrinsic-1.1.2" = { 1601 1601 name = "get-intrinsic"; 1602 1602 packageName = "get-intrinsic"; 1603 - version = "1.1.1"; 1603 + version = "1.1.2"; 1604 1604 src = fetchurl { 1605 - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; 1606 - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; 1605 + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; 1606 + sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; 1607 1607 }; 1608 1608 }; 1609 1609 "getpass-0.1.7" = { ··· 1612 1612 version = "0.1.7"; 1613 1613 src = fetchurl { 1614 1614 url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; 1615 - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; 1615 + sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; 1616 1616 }; 1617 1617 }; 1618 1618 "glob-7.2.0" = { ··· 1651 1651 sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; 1652 1652 }; 1653 1653 }; 1654 - "globals-13.15.0" = { 1654 + "globals-13.16.0" = { 1655 1655 name = "globals"; 1656 1656 packageName = "globals"; 1657 - version = "13.15.0"; 1657 + version = "13.16.0"; 1658 1658 src = fetchurl { 1659 - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; 1660 - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; 1659 + url = "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz"; 1660 + sha512 = "A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q=="; 1661 1661 }; 1662 1662 }; 1663 1663 "graceful-fs-4.2.10" = { ··· 1684 1684 version = "2.0.0"; 1685 1685 src = fetchurl { 1686 1686 url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; 1687 - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; 1687 + sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; 1688 1688 }; 1689 1689 }; 1690 1690 "har-validator-5.1.5" = { ··· 1711 1711 version = "3.0.0"; 1712 1712 src = fetchurl { 1713 1713 url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; 1714 - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; 1714 + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; 1715 1715 }; 1716 1716 }; 1717 1717 "has-flag-4.0.0" = { ··· 1783 1783 version = "0.0.4"; 1784 1784 src = fetchurl { 1785 1785 url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz"; 1786 - sha1 = "f7e2d6afbe18a87a78e63ba3308e753766740e3f"; 1786 + sha512 = "0uDvNVpzj/E2TfvLLyyXhKBRvF1y84aZsyRxRXFsQobnHaL4pcaXk+Y9cnFlvnxrBLeXDNq/VJBD+ngdBgQG1w=="; 1787 1787 }; 1788 1788 }; 1789 1789 "htmlparser2-4.1.0" = { ··· 1828 1828 version = "1.2.0"; 1829 1829 src = fetchurl { 1830 1830 url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; 1831 - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; 1831 + sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; 1832 1832 }; 1833 1833 }; 1834 1834 "https-proxy-agent-5.0.1" = { ··· 1840 1840 sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; 1841 1841 }; 1842 1842 }; 1843 - "humanize-duration-3.27.1" = { 1843 + "humanize-duration-3.27.2" = { 1844 1844 name = "humanize-duration"; 1845 1845 packageName = "humanize-duration"; 1846 - version = "3.27.1"; 1846 + version = "3.27.2"; 1847 1847 src = fetchurl { 1848 - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz"; 1849 - sha512 = "jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA=="; 1848 + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.2.tgz"; 1849 + sha512 = "A15OmA3FLFRnehvF4ZMocsxTZYvHq4ze7L+AgR1DeHw0xC9vMd4euInY83uqGU9/XXKNnVIEeKc1R8G8nKqtzg=="; 1850 1850 }; 1851 1851 }; 1852 1852 "humanize-duration-ts-2.1.1" = { ··· 1891 1891 version = "0.1.4"; 1892 1892 src = fetchurl { 1893 1893 url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; 1894 - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; 1894 + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; 1895 1895 }; 1896 1896 }; 1897 1897 "inflight-1.0.6" = { ··· 1900 1900 version = "1.0.6"; 1901 1901 src = fetchurl { 1902 1902 url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; 1903 - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; 1903 + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; 1904 1904 }; 1905 1905 }; 1906 1906 "inherits-2.0.4" = { ··· 1945 1945 version = "2.1.1"; 1946 1946 src = fetchurl { 1947 1947 url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; 1948 - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; 1948 + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; 1949 1949 }; 1950 1950 }; 1951 1951 "is-fullwidth-code-point-3.0.0" = { ··· 2017 2017 version = "1.0.0"; 2018 2018 src = fetchurl { 2019 2019 url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; 2020 - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; 2020 + sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; 2021 2021 }; 2022 2022 }; 2023 2023 "is-unicode-supported-0.1.0" = { ··· 2035 2035 version = "2.0.0"; 2036 2036 src = fetchurl { 2037 2037 url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; 2038 - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; 2038 + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; 2039 2039 }; 2040 2040 }; 2041 2041 "isstream-0.1.2" = { ··· 2044 2044 version = "0.1.2"; 2045 2045 src = fetchurl { 2046 2046 url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; 2047 - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; 2047 + sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; 2048 2048 }; 2049 2049 }; 2050 2050 "jest-diff-27.5.1" = { ··· 2116 2116 version = "0.1.1"; 2117 2117 src = fetchurl { 2118 2118 url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; 2119 - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; 2119 + sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; 2120 2120 }; 2121 2121 }; 2122 2122 "jsdom-16.7.0" = { ··· 2161 2161 version = "1.0.1"; 2162 2162 src = fetchurl { 2163 2163 url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; 2164 - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; 2164 + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; 2165 2165 }; 2166 2166 }; 2167 2167 "json-stringify-safe-5.0.1" = { ··· 2170 2170 version = "5.0.1"; 2171 2171 src = fetchurl { 2172 2172 url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; 2173 - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; 2173 + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; 2174 2174 }; 2175 2175 }; 2176 2176 "json5-1.0.1" = { ··· 2206 2206 version = "0.3.0"; 2207 2207 src = fetchurl { 2208 2208 url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; 2209 - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; 2209 + sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; 2210 2210 }; 2211 2211 }; 2212 2212 "levn-0.4.1" = { ··· 2251 2251 version = "4.4.2"; 2252 2252 src = fetchurl { 2253 2253 url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; 2254 - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; 2254 + sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; 2255 2255 }; 2256 2256 }; 2257 2257 "log-symbols-4.1.0" = { ··· 2314 2314 version = "0.3.0"; 2315 2315 src = fetchurl { 2316 2316 url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; 2317 - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; 2317 + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; 2318 2318 }; 2319 2319 }; 2320 2320 "merge-descriptors-1.0.1" = { ··· 2323 2323 version = "1.0.1"; 2324 2324 src = fetchurl { 2325 2325 url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; 2326 - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; 2326 + sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; 2327 2327 }; 2328 2328 }; 2329 2329 "methods-1.1.2" = { ··· 2332 2332 version = "1.1.2"; 2333 2333 src = fetchurl { 2334 2334 url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; 2335 - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; 2335 + sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; 2336 2336 }; 2337 2337 }; 2338 2338 "micromatch-4.0.5" = { ··· 2458 2458 version = "2.0.0"; 2459 2459 src = fetchurl { 2460 2460 url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; 2461 - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; 2461 + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; 2462 2462 }; 2463 2463 }; 2464 2464 "ms-2.1.2" = { ··· 2503 2503 version = "1.4.0"; 2504 2504 src = fetchurl { 2505 2505 url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; 2506 - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; 2506 + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; 2507 2507 }; 2508 2508 }; 2509 2509 "nearley-2.20.1" = { ··· 2533 2533 sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; 2534 2534 }; 2535 2535 }; 2536 - "nwsapi-2.2.0" = { 2536 + "nwsapi-2.2.1" = { 2537 2537 name = "nwsapi"; 2538 2538 packageName = "nwsapi"; 2539 - version = "2.2.0"; 2539 + version = "2.2.1"; 2540 2540 src = fetchurl { 2541 - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"; 2542 - sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; 2541 + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz"; 2542 + sha512 = "JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="; 2543 2543 }; 2544 2544 }; 2545 2545 "oauth-sign-0.9.0" = { ··· 2551 2551 sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; 2552 2552 }; 2553 2553 }; 2554 - "object-inspect-1.12.0" = { 2554 + "object-inspect-1.12.2" = { 2555 2555 name = "object-inspect"; 2556 2556 packageName = "object-inspect"; 2557 - version = "1.12.0"; 2557 + version = "1.12.2"; 2558 2558 src = fetchurl { 2559 - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; 2560 - sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; 2559 + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; 2560 + sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; 2561 2561 }; 2562 2562 }; 2563 2563 "on-finished-2.3.0" = { ··· 2566 2566 version = "2.3.0"; 2567 2567 src = fetchurl { 2568 2568 url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; 2569 - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; 2569 + sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; 2570 2570 }; 2571 2571 }; 2572 2572 "on-finished-2.4.1" = { ··· 2593 2593 version = "1.4.0"; 2594 2594 src = fetchurl { 2595 2595 url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; 2596 - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; 2596 + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; 2597 2597 }; 2598 2598 }; 2599 2599 "optionator-0.8.3" = { ··· 2656 2656 version = "1.0.2"; 2657 2657 src = fetchurl { 2658 2658 url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; 2659 - sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; 2659 + sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; 2660 2660 }; 2661 2661 }; 2662 2662 "parse5-6.0.1" = { ··· 2701 2701 version = "1.0.1"; 2702 2702 src = fetchurl { 2703 2703 url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; 2704 - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; 2704 + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; 2705 2705 }; 2706 2706 }; 2707 2707 "path-key-3.1.1" = { ··· 2728 2728 version = "0.1.7"; 2729 2729 src = fetchurl { 2730 2730 url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; 2731 - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; 2731 + sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; 2732 2732 }; 2733 2733 }; 2734 2734 "performance-now-2.1.0" = { ··· 2737 2737 version = "2.1.0"; 2738 2738 src = fetchurl { 2739 2739 url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; 2740 - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; 2740 + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; 2741 2741 }; 2742 2742 }; 2743 2743 "picocolors-1.0.0" = { ··· 2764 2764 version = "3.0.0"; 2765 2765 src = fetchurl { 2766 2766 url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; 2767 - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; 2767 + sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; 2768 2768 }; 2769 2769 }; 2770 - "postcss-8.4.13" = { 2770 + "postcss-8.4.14" = { 2771 2771 name = "postcss"; 2772 2772 packageName = "postcss"; 2773 - version = "8.4.13"; 2773 + version = "8.4.14"; 2774 2774 src = fetchurl { 2775 - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; 2776 - sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; 2775 + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; 2776 + sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; 2777 2777 }; 2778 2778 }; 2779 2779 "prelude-ls-1.1.2" = { ··· 2782 2782 version = "1.1.2"; 2783 2783 src = fetchurl { 2784 2784 url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; 2785 - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; 2785 + sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; 2786 2786 }; 2787 2787 }; 2788 2788 "prelude-ls-1.2.1" = { ··· 2827 2827 version = "1.0.2"; 2828 2828 src = fetchurl { 2829 2829 url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; 2830 - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; 2830 + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; 2831 2831 }; 2832 2832 }; 2833 - "psl-1.8.0" = { 2833 + "psl-1.9.0" = { 2834 2834 name = "psl"; 2835 2835 packageName = "psl"; 2836 - version = "1.8.0"; 2836 + version = "1.9.0"; 2837 2837 src = fetchurl { 2838 - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; 2839 - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; 2838 + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; 2839 + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; 2840 2840 }; 2841 2841 }; 2842 2842 "punycode-2.1.1" = { ··· 2872 2872 version = "1.0.0"; 2873 2873 src = fetchurl { 2874 2874 url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; 2875 - sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e"; 2875 + sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; 2876 2876 }; 2877 2877 }; 2878 2878 "randexp-0.4.6" = { ··· 2971 2971 version = "2.1.1"; 2972 2972 src = fetchurl { 2973 2973 url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; 2974 - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; 2974 + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; 2975 2975 }; 2976 2976 }; 2977 2977 "require-from-string-2.0.2" = { ··· 2983 2983 sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; 2984 2984 }; 2985 2985 }; 2986 - "resolve-1.22.0" = { 2986 + "resolve-1.22.1" = { 2987 2987 name = "resolve"; 2988 2988 packageName = "resolve"; 2989 - version = "1.22.0"; 2989 + version = "1.22.1"; 2990 2990 src = fetchurl { 2991 - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; 2992 - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; 2991 + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; 2992 + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; 2993 2993 }; 2994 2994 }; 2995 2995 "resolve-from-4.0.0" = { ··· 3169 3169 version = "1.0.1"; 3170 3170 src = fetchurl { 3171 3171 url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; 3172 - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; 3172 + sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; 3173 3173 }; 3174 3174 }; 3175 3175 "slash-3.0.0" = { ··· 3223 3223 version = "1.0.3"; 3224 3224 src = fetchurl { 3225 3225 url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; 3226 - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; 3226 + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; 3227 3227 }; 3228 3228 }; 3229 3229 "sshpk-1.17.0" = { ··· 3259 3259 version = "1.1.1"; 3260 3260 src = fetchurl { 3261 3261 url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; 3262 - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; 3262 + sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; 3263 3263 }; 3264 3264 }; 3265 3265 "steno-0.4.4" = { ··· 3268 3268 version = "0.4.4"; 3269 3269 src = fetchurl { 3270 3270 url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; 3271 - sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; 3271 + sha512 = "EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w=="; 3272 3272 }; 3273 3273 }; 3274 3274 "string-width-4.2.3" = { ··· 3295 3295 version = "3.0.0"; 3296 3296 src = fetchurl { 3297 3297 url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; 3298 - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; 3298 + sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; 3299 3299 }; 3300 3300 }; 3301 3301 "strip-json-comments-3.1.1" = { ··· 3367 3367 version = "0.2.0"; 3368 3368 src = fetchurl { 3369 3369 url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; 3370 - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; 3370 + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; 3371 3371 }; 3372 3372 }; 3373 3373 "to-regex-range-5.0.1" = { ··· 3475 3475 version = "0.6.0"; 3476 3476 src = fetchurl { 3477 3477 url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; 3478 - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; 3478 + sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; 3479 3479 }; 3480 3480 }; 3481 3481 "tweetnacl-0.14.5" = { ··· 3484 3484 version = "0.14.5"; 3485 3485 src = fetchurl { 3486 3486 url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; 3487 - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; 3487 + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; 3488 3488 }; 3489 3489 }; 3490 3490 "type-check-0.3.2" = { ··· 3493 3493 version = "0.3.2"; 3494 3494 src = fetchurl { 3495 3495 url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; 3496 - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; 3496 + sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; 3497 3497 }; 3498 3498 }; 3499 3499 "type-check-0.4.0" = { ··· 3523 3523 sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; 3524 3524 }; 3525 3525 }; 3526 - "typescript-4.6.4" = { 3526 + "typescript-4.7.4" = { 3527 3527 name = "typescript"; 3528 3528 packageName = "typescript"; 3529 - version = "4.6.4"; 3529 + version = "4.7.4"; 3530 3530 src = fetchurl { 3531 - url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz"; 3532 - sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="; 3531 + url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"; 3532 + sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; 3533 3533 }; 3534 3534 }; 3535 3535 "typescript-formatter-7.2.2" = { ··· 3556 3556 version = "1.0.0"; 3557 3557 src = fetchurl { 3558 3558 url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; 3559 - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; 3559 + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; 3560 3560 }; 3561 3561 }; 3562 3562 "uri-js-4.4.1" = { ··· 3574 3574 version = "1.0.1"; 3575 3575 src = fetchurl { 3576 3576 url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; 3577 - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; 3577 + sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; 3578 3578 }; 3579 3579 }; 3580 3580 "uuid-3.4.0" = { ··· 3601 3601 version = "1.1.2"; 3602 3602 src = fetchurl { 3603 3603 url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; 3604 - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; 3604 + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; 3605 3605 }; 3606 3606 }; 3607 3607 "verror-1.10.0" = { ··· 3610 3610 version = "1.10.0"; 3611 3611 src = fetchurl { 3612 3612 url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; 3613 - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; 3613 + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; 3614 3614 }; 3615 3615 }; 3616 3616 "w3c-hr-time-1.0.2" = { ··· 3718 3718 version = "1.0.2"; 3719 3719 src = fetchurl { 3720 3720 url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; 3721 - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; 3721 + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; 3722 3722 }; 3723 3723 }; 3724 - "ws-7.5.7" = { 3724 + "ws-7.5.9" = { 3725 3725 name = "ws"; 3726 3726 packageName = "ws"; 3727 - version = "7.5.7"; 3727 + version = "7.5.9"; 3728 3728 src = fetchurl { 3729 - url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; 3730 - sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; 3729 + url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; 3730 + sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; 3731 3731 }; 3732 3732 }; 3733 3733 "xml-name-validator-3.0.0" = { ··· 3763 3763 version = "2.1.2"; 3764 3764 src = fetchurl { 3765 3765 url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; 3766 - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; 3766 + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; 3767 3767 }; 3768 3768 }; 3769 3769 "yallist-4.0.0" = { ··· 3808 3808 version = "2.0.0"; 3809 3809 src = fetchurl { 3810 3810 url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz"; 3811 - sha1 = "e5adabc8acf408f6385fc76495684c88e6af689a"; 3811 + sha512 = "uTv8J/wiWTgUTg+9vLTi//leUl5vDQS6uii/emeTb2ssY7vl6QWf2fFbIIGjnhjvbdKlU0ed7QPgY1htTC86jQ=="; 3812 3812 }; 3813 3813 }; 3814 3814 "yocto-queue-0.1.0" = { ··· 3824 3824 args = { 3825 3825 name = "mjolnir"; 3826 3826 packageName = "mjolnir"; 3827 - version = "1.4.2"; 3828 - src = ../../../../../../../nix/store/spvdzz0i3m55099ds9bjrd30c15cv8a6-source; 3827 + version = "1.5.0"; 3828 + src = ../../../../../../../nix/store/q7qh1pmk8jl32g0d9v89kp9nnlz68fil-source; 3829 3829 dependencies = [ 3830 3830 sources."@babel/code-frame-7.12.11" 3831 - sources."@babel/helper-validator-identifier-7.16.7" 3832 - (sources."@babel/highlight-7.17.9" // { 3831 + sources."@babel/helper-validator-identifier-7.18.6" 3832 + (sources."@babel/highlight-7.18.6" // { 3833 3833 dependencies = [ 3834 3834 sources."ansi-styles-3.2.1" 3835 3835 sources."chalk-2.4.2" ··· 3863 3863 sources."@types/connect-3.4.35" 3864 3864 sources."@types/crypto-js-4.1.1" 3865 3865 sources."@types/express-4.17.13" 3866 - sources."@types/express-serve-static-core-4.17.28" 3866 + sources."@types/express-serve-static-core-4.17.29" 3867 3867 sources."@types/html-to-text-8.1.0" 3868 3868 sources."@types/humanize-duration-3.27.1" 3869 3869 sources."@types/istanbul-lib-coverage-2.0.4" ··· 3873 3873 sources."@types/json5-0.0.29" 3874 3874 sources."@types/mime-1.3.2" 3875 3875 sources."@types/mocha-9.1.1" 3876 - sources."@types/node-16.11.35" 3876 + sources."@types/node-16.11.45" 3877 3877 sources."@types/parse5-6.0.3" 3878 3878 sources."@types/qs-6.9.7" 3879 3879 sources."@types/range-parser-1.2.4" ··· 3901 3901 ]; 3902 3902 }) 3903 3903 sources."ajv-6.12.6" 3904 - sources."ansi-colors-4.1.2" 3904 + sources."ansi-colors-4.1.3" 3905 3905 sources."ansi-regex-5.0.1" 3906 3906 sources."ansi-styles-4.3.0" 3907 3907 sources."anymatch-3.1.2" ··· 4046 4046 sources."find-up-5.0.0" 4047 4047 sources."flat-5.0.2" 4048 4048 sources."flat-cache-3.0.4" 4049 - sources."flatted-3.2.5" 4049 + sources."flatted-3.2.6" 4050 4050 sources."forever-agent-0.6.1" 4051 4051 sources."form-data-3.0.1" 4052 4052 sources."forwarded-0.2.0" ··· 4056 4056 sources."function-bind-1.1.1" 4057 4057 sources."functional-red-black-tree-1.0.1" 4058 4058 sources."get-caller-file-2.0.5" 4059 - sources."get-intrinsic-1.1.1" 4059 + sources."get-intrinsic-1.1.2" 4060 4060 sources."getpass-0.1.7" 4061 4061 sources."glob-7.2.3" 4062 4062 sources."glob-parent-5.1.2" 4063 4063 sources."glob-to-regexp-0.4.1" 4064 - sources."globals-13.15.0" 4064 + sources."globals-13.16.0" 4065 4065 sources."graceful-fs-4.2.10" 4066 4066 sources."growl-1.10.5" 4067 4067 sources."har-schema-2.0.0" ··· 4089 4089 sources."ms-2.1.2" 4090 4090 ]; 4091 4091 }) 4092 - sources."humanize-duration-3.27.1" 4092 + sources."humanize-duration-3.27.2" 4093 4093 sources."humanize-duration-ts-2.1.1" 4094 4094 sources."iconv-lite-0.4.24" 4095 4095 sources."ignore-4.0.6" ··· 4117 4117 sources."jest-matcher-utils-27.5.1" 4118 4118 (sources."jest-message-util-27.5.1" // { 4119 4119 dependencies = [ 4120 - sources."@babel/code-frame-7.16.7" 4120 + sources."@babel/code-frame-7.18.6" 4121 4121 ]; 4122 4122 }) 4123 4123 sources."js-tokens-4.0.0" ··· 4188 4188 sources."nearley-2.20.1" 4189 4189 sources."negotiator-0.6.3" 4190 4190 sources."normalize-path-3.0.0" 4191 - sources."nwsapi-2.2.0" 4191 + sources."nwsapi-2.2.1" 4192 4192 sources."oauth-sign-0.9.0" 4193 - sources."object-inspect-1.12.0" 4193 + sources."object-inspect-1.12.2" 4194 4194 sources."on-finished-2.4.1" 4195 4195 sources."on-headers-1.0.2" 4196 4196 sources."once-1.4.0" ··· 4212 4212 sources."picocolors-1.0.0" 4213 4213 sources."picomatch-2.3.1" 4214 4214 sources."pify-3.0.0" 4215 - sources."postcss-8.4.13" 4215 + sources."postcss-8.4.14" 4216 4216 sources."prelude-ls-1.1.2" 4217 4217 (sources."pretty-format-27.5.1" // { 4218 4218 dependencies = [ ··· 4222 4222 sources."progress-2.0.3" 4223 4223 sources."proxy-addr-2.0.7" 4224 4224 sources."pseudomap-1.0.2" 4225 - sources."psl-1.8.0" 4225 + sources."psl-1.9.0" 4226 4226 sources."punycode-2.1.1" 4227 4227 sources."qs-6.10.3" 4228 4228 sources."railroad-diagrams-1.0.0" ··· 4248 4248 sources."request-promise-core-1.1.4" 4249 4249 sources."require-directory-2.1.1" 4250 4250 sources."require-from-string-2.0.2" 4251 - sources."resolve-1.22.0" 4251 + sources."resolve-1.22.1" 4252 4252 sources."resolve-from-4.0.0" 4253 4253 sources."ret-0.1.15" 4254 4254 sources."rimraf-3.0.2" ··· 4339 4339 sources."type-check-0.3.2" 4340 4340 sources."type-fest-0.20.2" 4341 4341 sources."type-is-1.6.18" 4342 - sources."typescript-4.6.4" 4342 + sources."typescript-4.7.4" 4343 4343 sources."typescript-formatter-7.2.2" 4344 4344 sources."universalify-0.1.2" 4345 4345 sources."unpipe-1.0.0" ··· 4360 4360 sources."workerpool-6.2.0" 4361 4361 sources."wrap-ansi-7.0.0" 4362 4362 sources."wrappy-1.0.2" 4363 - sources."ws-7.5.7" 4363 + sources."ws-7.5.9" 4364 4364 sources."xml-name-validator-3.0.0" 4365 4365 sources."xmlchars-2.2.0" 4366 4366 sources."y18n-5.0.8"
+13 -21
pkgs/servers/shishi/default.nix
··· 6 6 }: 7 7 8 8 let 9 - mkFlag = trueStr: falseStr: cond: name: val: "--" 10 - + (if cond then trueStr else falseStr) 11 - + name 12 - + lib.optionalString (val != null && cond != false) "=${val}"; 13 - mkEnable = mkFlag "enable-" "disable-"; 14 - mkWith = mkFlag "with-" "without-"; 15 - mkOther = mkFlag "" "" true; 16 - 17 9 shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; 18 10 19 11 optPam = shouldUsePkg pam; ··· 37 29 buildInputs = [ libgcrypt libgpg-error libtasn1 optPam optLibidn optGnutls ]; 38 30 39 31 configureFlags = [ 40 - (mkOther "sysconfdir" "/etc") 41 - (mkOther "localstatedir" "/var") 42 - (mkEnable true "libgcrypt" null) 43 - (mkEnable (optPam != null) "pam" null) 44 - (mkEnable true "ipv6" null) 45 - (mkWith (optLibidn != null) "stringprep" null) 46 - (mkEnable (optGnutls != null) "starttls" null) 47 - (mkEnable true "des" null) 48 - (mkEnable true "3des" null) 49 - (mkEnable true "aes" null) 50 - (mkEnable true "md" null) 51 - (mkEnable false "null" null) 52 - (mkEnable true "arcfour" null) 32 + "--sysconfdir=/etc" 33 + "--localstatedir=/var" 34 + (enableFeature true "libgcrypt") 35 + (enableFeature (optPam != null) "pam") 36 + (enableFeature true "ipv6") 37 + (withFeature (optLibidn != null) "stringprep") 38 + (enableFeature (optGnutls != null) "starttls") 39 + (enableFeature true "des") 40 + (enableFeature true "3des") 41 + (enableFeature true "aes") 42 + (enableFeature true "md") 43 + (enableFeature false "null") 44 + (enableFeature true "arcfour") 53 45 ]; 54 46 55 47 NIX_CFLAGS_COMPILE
+76 -21
pkgs/tools/graphics/wkhtmltopdf-bin/default.nix
··· 1 - { stdenv, lib, fetchurl, wkhtmltopdf, xar, cpio }: 1 + { lib 2 + , autoPatchelfHook 3 + , cpio 4 + , freetype 5 + , zlib 6 + , openssl 7 + , dpkg 8 + , fetchurl 9 + , gcc-unwrapped 10 + , libjpeg8 11 + , libpng 12 + , fontconfig 13 + , stdenv 14 + , wkhtmltopdf 15 + , xar 16 + , xorg 17 + }: 18 + 19 + let 20 + darwinAttrs = rec { 21 + version = "0.12.6-2"; 22 + src = fetchurl { 23 + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg"; 24 + sha256 = "sha256-gaZrd7UI/t6NvKpnEnIDdIN2Vos2c6F/ZhG21R6YlPg="; 25 + }; 2 26 3 - stdenv.mkDerivation rec { 27 + nativeBuildInputs = [ xar cpio ]; 4 28 5 - pname = "wkhtmltopdf-bin"; 6 - version = "0.12.6-1"; 7 - sha256 = "1db59kdprzpmvdj1bg47lmfgi3zlvzvqif11sbym9hw61xy6gp3d"; 8 - src = fetchurl { 9 - url = 10 - "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg"; 11 - inherit sha256; 29 + unpackPhase = '' 30 + xar -xf $src 31 + zcat Payload | cpio -i 32 + tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz 33 + ''; 34 + 35 + installPhase = '' 36 + runHook preInstall 37 + mkdir -p $out 38 + cp -r bin include lib share $out/ 39 + runHook postInstall 40 + ''; 12 41 }; 13 42 14 - buildInputs = [ xar cpio ]; 43 + linuxAttrs = rec { 44 + version = "0.12.6-3"; 45 + src = fetchurl { 46 + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.archlinux-x86_64.pkg.tar.xz"; 47 + sha256 = "sha256-6Ewu8sPRbqvYWj27mBlQYpEN+mb+vKT46ljrdEUxckI="; 48 + }; 15 49 16 - unpackPhase = '' 17 - xar -xf $src 18 - zcat Payload | cpio -i 19 - tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz 20 - ''; 50 + nativeBuildInputs = [ autoPatchelfHook ]; 21 51 22 - installPhase = '' 23 - mkdir -p $out 24 - cp -r bin include lib share $out/ 25 - ''; 52 + buildInputs = [ 53 + xorg.libXext 54 + xorg.libXrender 55 + 56 + freetype 57 + openssl 58 + zlib 59 + 60 + (lib.getLib fontconfig) 61 + (lib.getLib gcc-unwrapped) 62 + (lib.getLib libjpeg8) 63 + (lib.getLib libpng) 64 + ]; 65 + 66 + unpackPhase = "tar -xf $src"; 67 + 68 + installPhase = '' 69 + runHook preInstall 70 + mkdir -p $out 71 + cp -r usr/bin usr/include usr/lib usr/share $out/ 72 + runHook postInstall 73 + ''; 74 + }; 75 + in 76 + stdenv.mkDerivation ({ 77 + pname = "wkhtmltopdf-bin"; 26 78 27 79 dontStrip = true; 28 80 ··· 45 97 There is also a C library, if you're into that kind of thing. 46 98 ''; 47 99 license = licenses.gpl3Plus; 48 - maintainers = with maintainers; [ nbr ]; 49 - platforms = [ "x86_64-darwin" ]; 100 + maintainers = with maintainers; [ nbr kalbasit ]; 101 + platforms = [ "x86_64-darwin" "x86_64-linux" ]; 50 102 }; 51 103 } 104 + // lib.optionalAttrs (stdenv.hostPlatform.isDarwin) darwinAttrs 105 + // lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs 106 + )
+6 -10
pkgs/tools/misc/fsrx/default.nix
··· 1 - { lib, fetchFromGitHub, rustPlatform, gitUpdater, testers, fsrx }: 1 + { lib, fetchFromGitHub, rustPlatform, testers, fsrx }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "fsrx"; 5 - version = "1.0.0"; 5 + version = "1.0.2"; 6 6 7 7 src = fetchFromGitHub { 8 - owner = "coloradocolby"; 8 + owner = "thatvegandev"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-pKdxYO8Rhck3UYxqiWHDlrlPS4cAPe5jLUu5Dajop/k="; 11 + sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA="; 12 12 }; 13 13 14 - cargoSha256 = "sha256-5h+ou9FLCG/WWMEQPsCTa1q+PovxUJs+6lzQ0L2bKIs="; 14 + cargoSha256 = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y="; 15 15 16 16 passthru = { 17 - updateScript = gitUpdater { 18 - inherit pname version; 19 - rev-prefix = "v"; 20 - }; 21 17 tests.version = testers.testVersion { 22 18 package = fsrx; 23 19 }; ··· 25 21 26 22 meta = with lib; { 27 23 description = "A flow state reader in the terminal"; 28 - homepage = "https://github.com/coloradocolby/fsrx"; 24 + homepage = "https://github.com/thatvegandev/fsrx"; 29 25 license = licenses.mit; 30 26 maintainers = with maintainers; [ MoritzBoehme ]; 31 27 };
+3 -2
pkgs/tools/misc/you-get/default.nix
··· 7 7 8 8 python3.pkgs.buildPythonApplication rec { 9 9 pname = "you-get"; 10 - version = "0.4.1612"; 10 + version = "0.4.1620"; 11 11 12 12 # Tests aren't packaged, but they all hit the real network so 13 13 # probably aren't suitable for a build environment anyway. ··· 15 15 16 16 src = python3.pkgs.fetchPypi { 17 17 inherit pname version; 18 - sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w="; 18 + sha256 = "sha256-wCDaT9Nz1ZiSsqFwX1PXHq6QF6fjLRI9wwvvWxcmYOY="; 19 19 }; 20 20 21 21 patches = [ ··· 39 39 meta = with lib; { 40 40 description = "A tiny command line utility to download media contents from the web"; 41 41 homepage = "https://you-get.org"; 42 + changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; 42 43 license = licenses.mit; 43 44 maintainers = with maintainers; [ ryneeverett ]; 44 45 };
+5 -10
pkgs/tools/security/pinentry/default.nix
··· 16 16 then mkDerivation 17 17 else stdenv.mkDerivation; 18 18 19 - mkFlag = pfxTrue: pfxFalse: cond: name: 20 - "--${if cond then pfxTrue else pfxFalse}-${name}"; 21 - mkEnable = mkFlag "enable" "disable"; 22 - mkWith = mkFlag "with" "without"; 23 - 24 - mkEnablePinentry = f: 19 + enableFeaturePinentry = f: 25 20 let 26 21 info = flavorInfo.${f}; 27 22 flag = flavorInfo.${f}.flag or null; 28 23 in 29 24 optionalString (flag != null) 30 - (mkEnable (elem f enabledFlavors) ("pinentry-" + flag)); 25 + (enableFeature (elem f enabledFlavors) ("pinentry-" + flag)); 31 26 32 27 flavorInfo = { 33 28 curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; }; ··· 68 63 ]; 69 64 70 65 configureFlags = [ 71 - (mkWith (libcap != null) "libcap") 72 - (mkEnable (libsecret != null) "libsecret") 73 - ] ++ (map mkEnablePinentry (attrNames flavorInfo)); 66 + (withFeature (libcap != null) "libcap") 67 + (enableFeature (libsecret != null) "libsecret") 68 + ] ++ (map enableFeaturePinentry (attrNames flavorInfo)); 74 69 75 70 postInstall = 76 71 concatStrings (flip map enabledFlavors (f:
+66 -69
pkgs/tools/system/rsyslog/default.nix
··· 9 9 }: 10 10 11 11 with lib; 12 - let 13 - mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; 14 - in 15 12 stdenv.mkDerivation rec { 16 13 pname = "rsyslog"; 17 14 version = "8.2204.1"; ··· 36 33 "--sysconfdir=/etc" 37 34 "--localstatedir=/var" 38 35 "--with-systemdsystemunitdir=\${out}/etc/systemd/system" 39 - (mkFlag true "largefile") 40 - (mkFlag true "regexp") 41 - (mkFlag (libkrb5 != null) "gssapi-krb5") 42 - (mkFlag true "klog") 43 - (mkFlag true "kmsg") 44 - (mkFlag (systemd != null) "imjournal") 45 - (mkFlag true "inet") 46 - (mkFlag (jemalloc != null) "jemalloc") 47 - (mkFlag true "unlimited-select") 48 - (mkFlag false "debug") 49 - (mkFlag false "debug-symbols") 50 - (mkFlag true "debugless") 51 - (mkFlag false "valgrind") 52 - (mkFlag false "diagtools") 53 - (mkFlag true "usertools") 54 - (mkFlag (libmysqlclient != null) "mysql") 55 - (mkFlag (postgresql != null) "pgsql") 56 - (mkFlag (libdbi != null) "libdbi") 57 - (mkFlag (net-snmp != null) "snmp") 58 - (mkFlag (libuuid != null) "uuid") 59 - (mkFlag (curl != null) "elasticsearch") 60 - (mkFlag (gnutls != null) "gnutls") 61 - (mkFlag (libgcrypt != null) "libgcrypt") 62 - (mkFlag true "rsyslogrt") 63 - (mkFlag true "rsyslogd") 64 - (mkFlag true "mail") 65 - (mkFlag (liblognorm != null) "mmnormalize") 66 - (mkFlag (libmaxminddb != null) "mmdblookup") 67 - (mkFlag true "mmjsonparse") 68 - (mkFlag true "mmaudit") 69 - (mkFlag true "mmanon") 70 - (mkFlag true "mmutf8fix") 71 - (mkFlag true "mmcount") 72 - (mkFlag true "mmsequence") 73 - (mkFlag true "mmfields") 74 - (mkFlag true "mmpstrucdata") 75 - (mkFlag (openssl != null) "mmrfc5424addhmac") 76 - (mkFlag (librelp != null) "relp") 77 - (mkFlag (libksi != null) "ksi-ls12") 78 - (mkFlag (liblogging != null) "liblogging-stdlog") 79 - (mkFlag (liblogging != null) "rfc3195") 80 - (mkFlag true "imfile") 81 - (mkFlag false "imsolaris") 82 - (mkFlag true "imptcp") 83 - (mkFlag true "impstats") 84 - (mkFlag true "omprog") 85 - (mkFlag (libnet != null) "omudpspoof") 86 - (mkFlag true "omstdout") 87 - (mkFlag (systemd != null) "omjournal") 88 - (mkFlag true "pmlastmsg") 89 - (mkFlag true "pmcisconames") 90 - (mkFlag true "pmciscoios") 91 - (mkFlag true "pmaixforwardedfrom") 92 - (mkFlag true "pmsnare") 93 - (mkFlag true "omruleset") 94 - (mkFlag true "omuxsock") 95 - (mkFlag true "mmsnmptrapd") 96 - (mkFlag (hadoop != null) "omhdfs") 97 - (mkFlag (rdkafka != null) "omkafka") 98 - (mkFlag (libmongo-client != null) "ommongodb") 99 - (mkFlag (czmq != null) "imczmq") 100 - (mkFlag (czmq != null) "omczmq") 101 - (mkFlag (rabbitmq-c != null) "omrabbitmq") 102 - (mkFlag (hiredis != null) "omhiredis") 103 - (mkFlag (curl != null) "omhttpfs") 104 - (mkFlag true "generate-man-pages") 36 + (enableFeature true "largefile") 37 + (enableFeature true "regexp") 38 + (enableFeature (libkrb5 != null) "gssapi-krb5") 39 + (enableFeature true "klog") 40 + (enableFeature true "kmsg") 41 + (enableFeature (systemd != null) "imjournal") 42 + (enableFeature true "inet") 43 + (enableFeature (jemalloc != null) "jemalloc") 44 + (enableFeature true "unlimited-select") 45 + (enableFeature false "debug") 46 + (enableFeature false "debug-symbols") 47 + (enableFeature true "debugless") 48 + (enableFeature false "valgrind") 49 + (enableFeature false "diagtools") 50 + (enableFeature true "usertools") 51 + (enableFeature (libmysqlclient != null) "mysql") 52 + (enableFeature (postgresql != null) "pgsql") 53 + (enableFeature (libdbi != null) "libdbi") 54 + (enableFeature (net-snmp != null) "snmp") 55 + (enableFeature (libuuid != null) "uuid") 56 + (enableFeature (curl != null) "elasticsearch") 57 + (enableFeature (gnutls != null) "gnutls") 58 + (enableFeature (libgcrypt != null) "libgcrypt") 59 + (enableFeature true "rsyslogrt") 60 + (enableFeature true "rsyslogd") 61 + (enableFeature true "mail") 62 + (enableFeature (liblognorm != null) "mmnormalize") 63 + (enableFeature (libmaxminddb != null) "mmdblookup") 64 + (enableFeature true "mmjsonparse") 65 + (enableFeature true "mmaudit") 66 + (enableFeature true "mmanon") 67 + (enableFeature true "mmutf8fix") 68 + (enableFeature true "mmcount") 69 + (enableFeature true "mmsequence") 70 + (enableFeature true "mmfields") 71 + (enableFeature true "mmpstrucdata") 72 + (enableFeature (openssl != null) "mmrfc5424addhmac") 73 + (enableFeature (librelp != null) "relp") 74 + (enableFeature (libksi != null) "ksi-ls12") 75 + (enableFeature (liblogging != null) "liblogging-stdlog") 76 + (enableFeature (liblogging != null) "rfc3195") 77 + (enableFeature true "imfile") 78 + (enableFeature false "imsolaris") 79 + (enableFeature true "imptcp") 80 + (enableFeature true "impstats") 81 + (enableFeature true "omprog") 82 + (enableFeature (libnet != null) "omudpspoof") 83 + (enableFeature true "omstdout") 84 + (enableFeature (systemd != null) "omjournal") 85 + (enableFeature true "pmlastmsg") 86 + (enableFeature true "pmcisconames") 87 + (enableFeature true "pmciscoios") 88 + (enableFeature true "pmaixforwardedfrom") 89 + (enableFeature true "pmsnare") 90 + (enableFeature true "omruleset") 91 + (enableFeature true "omuxsock") 92 + (enableFeature true "mmsnmptrapd") 93 + (enableFeature (hadoop != null) "omhdfs") 94 + (enableFeature (rdkafka != null) "omkafka") 95 + (enableFeature (libmongo-client != null) "ommongodb") 96 + (enableFeature (czmq != null) "imczmq") 97 + (enableFeature (czmq != null) "omczmq") 98 + (enableFeature (rabbitmq-c != null) "omrabbitmq") 99 + (enableFeature (hiredis != null) "omhiredis") 100 + (enableFeature (curl != null) "omhttpfs") 101 + (enableFeature true "generate-man-pages") 105 102 ]; 106 103 107 104 passthru.tests = {
+5 -1
pkgs/top-level/all-packages.nix
··· 12032 12032 12033 12033 wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; 12034 12034 12035 - wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { }; 12035 + wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { 12036 + libjpeg8 = libjpeg.override { enableJpeg8 = true; }; 12037 + }; 12036 12038 12037 12039 wml = callPackage ../development/web/wml { }; 12038 12040 ··· 34379 34381 geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; 34380 34382 34381 34383 cernlib = callPackage ../development/libraries/physics/cernlib { }; 34384 + 34385 + clhep = callPackage ../development/libraries/physics/clhep { }; 34382 34386 34383 34387 hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; 34384 34388