lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge master into staging-next

authored by

github-actions[bot] and committed by
GitHub
933da575 2663e5b6

+1215 -148
+7 -7
doc/languages-frameworks/rust.section.md
··· 454 454 * `maturinBuildHook`: use [Maturin](https://github.com/PyO3/maturin) 455 455 to build a Python wheel. Similar to `cargoBuildHook`, the optional 456 456 variable `buildAndTestSubdir` can be used to build a crate in a 457 - Cargo workspace. Additional maturin flags can be passed through 457 + Cargo workspace. Additional Maturin flags can be passed through 458 458 `maturinBuildFlags`. 459 459 * `cargoCheckHook`: run tests using Cargo. The build type for checks 460 460 can be set using `cargoCheckType`. Features can be specified with ··· 476 476 477 477 The following example outlines how the `tokenizers` Python package is 478 478 built. Since the Python package is in the `source/bindings/python` 479 - directory of the *tokenizers* project's source archive, we use 479 + directory of the `tokenizers` project's source archive, we use 480 480 `sourceRoot` to point the tooling to this directory: 481 481 482 482 ```nix ··· 758 758 Actually, the overrides introduced in the previous section are more 759 759 general. A number of other parameters can be overridden: 760 760 761 - - The version of rustc used to compile the crate: 761 + - The version of `rustc` used to compile the crate: 762 762 763 763 ```nix 764 764 (hello {}).override { rust = pkgs.rust; }; ··· 771 771 (hello {}).override { release = false; }; 772 772 ``` 773 773 774 - - Whether to print the commands sent to rustc when building 774 + - Whether to print the commands sent to `rustc` when building 775 775 (equivalent to `--verbose` in cargo: 776 776 777 777 ```nix ··· 912 912 913 913 Fenix is an alternative to `rustup` and can also be used as an overlay. 914 914 915 - Both Oxalica's overlay and fenix better integrate with nix and cache optimizations. 915 + Both oxalica's overlay and fenix better integrate with nix and cache optimizations. 916 916 Because of this and ergonomics, either of those community projects 917 - should be preferred to the Mozilla's Rust overlay (nixpkgs-mozilla). 917 + should be preferred to the Mozilla's Rust overlay (`nixpkgs-mozilla`). 918 918 919 - ### How to select a specific rustc and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version} 919 + ### How to select a specific `rustc` and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version} 920 920 921 921 You can consume the oxalica overlay and use it to grab a specific Rust toolchain version. 922 922 Here is an example `shell.nix` showing how to grab the current stable toolchain:
+12
maintainers/maintainer-list.nix
··· 4201 4201 githubId = 1713676; 4202 4202 name = "Luis G. Torres"; 4203 4203 }; 4204 + GKasparov = { 4205 + email = "mizozahr@gmail.com"; 4206 + github = "GKasparov"; 4207 + githubId = 60962839; 4208 + name = "Mazen Zahr"; 4209 + }; 4204 4210 gleber = { 4205 4211 email = "gleber.p@gmail.com"; 4206 4212 github = "gleber"; ··· 9383 9389 github = "r-burns"; 9384 9390 githubId = 52847440; 9385 9391 name = "Ryan Burns"; 9392 + }; 9393 + r3dl3g = { 9394 + email = "redleg@rothfuss-web.de"; 9395 + github = "r3dl3g"; 9396 + githubId = 35229674; 9397 + name = "Armin Rothfuss"; 9386 9398 }; 9387 9399 raboof = { 9388 9400 email = "arnout@bzzt.net";
+33 -12
nixos/tests/owncast.nix
··· 1 - { system ? builtins.currentSystem, config ? { } 2 - , pkgs ? import ../.. { inherit system config; } }: 3 - 4 - with import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; }; 5 - makeTest { 1 + import ./make-test-python.nix ({ pkgs, ... }: { 6 2 name = "owncast"; 7 - meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ MayNiklas ]; }; 3 + meta = with pkgs.lib.maintainers; { maintainers = [ MayNiklas ]; }; 8 4 9 5 nodes = { 10 - client = { ... }: { 11 - environment.systemPackages = [ curl ]; 12 - services.owncast = { enable = true; }; 6 + client = { pkgs, ... }: with pkgs.lib; { 7 + networking = { 8 + dhcpcd.enable = false; 9 + interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ]; 10 + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ]; 11 + }; 12 + }; 13 + server = { pkgs, ... }: with pkgs.lib; { 14 + networking = { 15 + dhcpcd.enable = false; 16 + useNetworkd = true; 17 + useDHCP = false; 18 + interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ]; 19 + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ]; 20 + 21 + firewall.allowedTCPPorts = [ 8080 ]; 22 + }; 23 + 24 + services.owncast = { 25 + enable = true; 26 + listen = "0.0.0.0"; 27 + }; 13 28 }; 14 29 }; 15 30 16 31 testScript = '' 17 32 start_all() 18 - client.wait_for_unit("owncast.service") 19 - client.succeed("curl localhost:8080/api/status") 33 + 34 + client.wait_for_unit("network-online.target") 35 + server.wait_for_unit("network-online.target") 36 + server.wait_for_unit("owncast.service") 37 + server.wait_until_succeeds("ss -ntl | grep -q 8080") 38 + 39 + client.succeed("curl http://192.168.1.1:8080/api/status") 40 + client.succeed("curl http://[fd00::1]:8080/api/status") 20 41 ''; 21 - } 42 + })
+2 -2
pkgs/applications/blockchains/btcpayserver/default.nix
··· 3 3 4 4 buildDotnetModule rec { 5 5 pname = "btcpayserver"; 6 - version = "1.3.2"; 6 + version = "1.3.3"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = pname; 10 10 repo = pname; 11 11 rev = "v${version}"; 12 - sha256 = "sha256-TAngdQz3FupoqPrqskjSQ9xSDbZV4/6+j7C4NjBFcFw="; 12 + sha256 = "sha256-IBdQlVZx7Bt4y7B7FvHJihHUWO15a89hs+SGwcobDqY="; 13 13 }; 14 14 15 15 projectFile = "BTCPayServer/BTCPayServer.csproj";
+95
pkgs/applications/editors/eclipse/plugins.nix
··· 639 639 }; 640 640 }; 641 641 642 + ivyde = buildEclipsePlugin rec { 643 + name = "ivyde-${version}"; 644 + version = "2.2.0.final-201311091524-RELEASE"; 645 + 646 + srcFeature = fetchurl { 647 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.feature_${version}.jar"; 648 + sha1 = "c8fb6c4aab32db13db0bd81c1a148032667fff31"; 649 + }; 650 + 651 + srcPlugin = fetchurl { 652 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse_${version}.jar"; 653 + sha1 = "0c80c2e228a07f18efab1c56ea026448eda70c06"; 654 + }; 655 + 656 + meta = with lib; { 657 + homepage = "https://ant.apache.org/ivy/ivyde/index.html"; 658 + description = "A plugin which integrates Apache Ivy's dependency management"; 659 + license = licenses.asl20; 660 + platforms = platforms.all; 661 + maintainers = [ maintainers.r3dl3g ]; 662 + }; 663 + }; 664 + 665 + ivyderv = buildEclipsePlugin rec { 666 + name = "ivyderv-${version}"; 667 + version = "2.2.0.final-201311091524-RELEASE"; 668 + 669 + srcFeature = fetchurl { 670 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/features/org.apache.ivyde.eclipse.resolvevisualizer.feature_${version}.jar"; 671 + sha1 = "fb1941eaa2c0de54259de01b0da6d5a6b4a2cab1"; 672 + }; 673 + 674 + srcPlugin = fetchurl { 675 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivyde-${version}/plugins/org.apache.ivyde.eclipse.resolvevisualizer_${version}.jar"; 676 + sha1 = "225e0c8ccb010d622c159560638578c2fc51a67e"; 677 + }; 678 + 679 + meta = with lib; { 680 + homepage = "https://ant.apache.org/ivy/ivyde/index.html"; 681 + description = "A graph viewer of the resolved dependencies."; 682 + longDescription = '' 683 + Apache IvyDE Resolve Visualizer is an optional dependency of Apache IvyDE since 684 + it requires additional plugins to be installed (Zest). 685 + ''; 686 + license = licenses.asl20; 687 + platforms = platforms.all; 688 + maintainers = [ maintainers.r3dl3g ]; 689 + }; 690 + }; 691 + 692 + ivy = buildEclipsePlugin rec { 693 + name = "ivy-${version}"; 694 + version = "2.5.0.final_20191020104435"; 695 + 696 + srcFeature = fetchurl { 697 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/features/org.apache.ivy.eclipse.ant.feature_${version}.jar"; 698 + sha256 = "de6134171a0edf569bb9b4c3a91639d469f196e86804d218adfdd60a5d7fa133"; 699 + }; 700 + 701 + srcPlugin = fetchurl { 702 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/plugins/org.apache.ivy.eclipse.ant_${version}.jar"; 703 + sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5"; 704 + }; 705 + 706 + meta = with lib; { 707 + homepage = "https://ant.apache.org/ivy/index.html"; 708 + description = "A popular dependency manager focusing on flexibility and simplicity"; 709 + license = licenses.asl20; 710 + platforms = platforms.all; 711 + maintainers = [ maintainers.r3dl3g ]; 712 + }; 713 + }; 714 + 715 + ivyant = buildEclipsePlugin rec { 716 + name = "ivyant-${version}"; 717 + version = "2.5.0.final_20191020104435"; 718 + 719 + srcFeature = fetchurl { 720 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/features/org.apache.ivy.eclipse.ant.feature_${version}.jar"; 721 + sha256 = "de6134171a0edf569bb9b4c3a91639d469f196e86804d218adfdd60a5d7fa133"; 722 + }; 723 + 724 + srcPlugin = fetchurl { 725 + url = "https://downloads.apache.org/ant/ivyde/updatesite/ivy-${version}/plugins/org.apache.ivy.eclipse.ant_${version}.jar"; 726 + sha256 = "9e8ea20480cf73d0f0f3fb032d263c7536b24fd2eef71beb7d62af4e065f9ab5"; 727 + }; 728 + 729 + meta = with lib; { 730 + homepage = "https://ant.apache.org/ivy/ivyde/index.html"; 731 + description = "Ant Tasks integrated into Eclipse's Ant runtime"; 732 + license = licenses.asl20; 733 + platforms = platforms.all; 734 + maintainers = [ maintainers.r3dl3g ]; 735 + }; 736 + }; 642 737 }
+66 -5
pkgs/applications/misc/azuredatastudio/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchurl 4 + , copyDesktopItems 5 + , makeDesktopItem 4 6 , makeWrapper 5 7 , libuuid 6 8 , libunwind 9 + , libxkbcommon 7 10 , icu 8 11 , openssl 9 12 , zlib ··· 13 16 , gnutar 14 17 , atomEnv 15 18 , libkrb5 19 + , libdrm 20 + , mesa 21 + , xorg 16 22 }: 17 23 18 24 # from justinwoo/azuredatastudio-nix 19 25 # https://github.com/justinwoo/azuredatastudio-nix/blob/537c48aa3981cd1a82d5d6e508ab7e7393b3d7c8/default.nix 20 26 27 + let 28 + desktopItem = makeDesktopItem { 29 + name = "azuredatastudio"; 30 + desktopName = "Azure Data Studio"; 31 + comment = "Data Management Tool that enables you to work with SQL Server, Azure SQL DB and SQL DW from Windows, macOS and Linux."; 32 + genericName = "Text Editor"; 33 + exec = "azuredatastudio --no-sandbox --unity-launch %F"; 34 + icon = "azuredatastudio"; 35 + startupNotify = "true"; 36 + categories = "Utility;TextEditor;Development;IDE;"; 37 + mimeType = "text/plain;inode/directory;application/x-azuredatastudio-workspace;"; 38 + extraEntries = '' 39 + StartupWMClass=azuredatastudio 40 + Actions=new-empty-window; 41 + Keywords=azuredatastudio; 42 + 43 + [Desktop Action new-empty-window] 44 + Name=New Empty Window 45 + Exec=azuredatastudio --no-sandbox --new-window %F 46 + Icon=azuredatastudio 47 + ''; 48 + }; 49 + 50 + urlHandlerDesktopItem = makeDesktopItem { 51 + name = "azuredatastudio-url-handler"; 52 + desktopName = "Azure Data Studio - URL Handler"; 53 + comment = "Azure Data Studio"; 54 + genericName = "Text Editor"; 55 + exec = "azuredatastudio --no-sandbox --open-url %U"; 56 + icon = "azuredatastudio"; 57 + startupNotify = "true"; 58 + categories = "Utility;TextEditor;Development;IDE;"; 59 + mimeType = "x-scheme-handler/azuredatastudio;"; 60 + extraEntries = '' 61 + NoDisplay=true 62 + Keywords=azuredatastudio; 63 + ''; 64 + }; 65 + in 21 66 stdenv.mkDerivation rec { 22 67 23 68 pname = "azuredatastudio"; 24 - version = "1.17.1"; 69 + version = "1.33.0"; 70 + 71 + desktopItems = [ desktopItem urlHandlerDesktopItem ]; 25 72 26 73 src = fetchurl { 27 - url = "https://azuredatastudiobuilds.blob.core.windows.net/releases/${version}/azuredatastudio-linux-${version}.tar.gz"; 28 - sha256 = "0px9n9vyjvyddca4x7d0zindd0dim7350vkjg5dd0506fm8dc38k"; 74 + name = "${pname}-${version}.tar.gz"; 75 + url = "https://azuredatastudio-update.azurewebsites.net/${version}/linux-x64/stable"; 76 + sha256 = "0593xs44ryfyxy0hc31hdbj706q16h58jb0qyfyncn7ngybm3423"; 29 77 }; 30 78 31 79 nativeBuildInputs = [ 32 80 makeWrapper 81 + copyDesktopItems 33 82 ]; 34 83 35 84 buildInputs = [ ··· 38 87 at-spi2-atk 39 88 ]; 40 89 41 - dontInstall = true; 90 + installPhase = '' 91 + runHook preInstall 92 + 93 + mkdir -p $out/share/pixmaps 94 + cp ${targetPath}/resources/app/resources/linux/code.png $out/share/pixmaps/azuredatastudio.png 95 + 96 + runHook postInstall 97 + ''; 42 98 43 99 # change this to azuredatastudio-insiders for insiders releases 44 100 edition = "azuredatastudio"; ··· 60 116 ]; 61 117 62 118 # this will most likely need to be updated when azuredatastudio's version changes 63 - sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/2.0.0-release.56"; 119 + sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/3.0.0-release.139"; 64 120 65 121 rpath = lib.concatStringsSep ":" [ 66 122 atomEnv.libPath ··· 71 127 at-spi2-atk 72 128 stdenv.cc.cc.lib 73 129 libkrb5 130 + libdrm 131 + libxkbcommon 132 + mesa 133 + xorg.libxshmfence 74 134 ] 75 135 ) 76 136 targetPath ··· 111 171 description = "A data management tool that enables working with SQL Server, Azure SQL DB and SQL DW"; 112 172 homepage = "https://docs.microsoft.com/en-us/sql/azure-data-studio/download-azure-data-studio"; 113 173 license = lib.licenses.unfreeRedistributable; 174 + platforms = [ "x86_64-linux" ]; 114 175 }; 115 176 }
+88
pkgs/applications/misc/snapmaker-luban/default.nix
··· 1 + { lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook, fetchurl 2 + , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups 3 + , gtk3, nss, glib, dbus, nspr, gdk-pixbuf 4 + , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext 5 + , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, pango 6 + , gcc-unwrapped, udev 7 + }: 8 + 9 + stdenv.mkDerivation rec { 10 + pname = "snapmaker-luban"; 11 + version = "4.0.3"; 12 + 13 + src = fetchurl { 14 + url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; 15 + sha256 = "13qk7ssfawjaa5p4mnml4ndzzsqs26qpi76hc9qaipi74ss3jih4"; 16 + }; 17 + 18 + nativeBuildInputs = [ 19 + autoPatchelfHook 20 + wrapGAppsHook 21 + copyDesktopItems 22 + ]; 23 + 24 + buildInputs = [ 25 + alsa-lib 26 + at-spi2-atk 27 + at-spi2-core 28 + cairo 29 + cups 30 + gcc-unwrapped 31 + gtk3 32 + libXdamage 33 + libX11 34 + libXScrnSaver 35 + libXtst 36 + libxcb 37 + nspr 38 + nss 39 + ]; 40 + 41 + libPath = lib.makeLibraryPath [ 42 + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups 43 + gdk-pixbuf glib gtk3 libX11 libXcomposite 44 + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender 45 + libXtst nspr nss libxcb pango libXScrnSaver udev 46 + ]; 47 + 48 + dontWrapGApps = true; 49 + 50 + installPhase = '' 51 + runHook preInstall 52 + 53 + mkdir -p $out/{bin,opt,share/pixmaps}/ 54 + mv * $out/opt/ 55 + 56 + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ 57 + $out/opt/snapmaker-luban 58 + 59 + wrapProgram $out/opt/snapmaker-luban \ 60 + "''${gappsWrapperArgs[@]}" \ 61 + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ 62 + --prefix LD_LIBRARY_PATH : ${libPath}:$out/snapmaker-luban 63 + 64 + ln -s $out/opt/snapmaker-luban $out/bin/snapmaker-luban 65 + ln -s $out/opt/resources/app/app/resources/images/snap-luban-logo-64x64.png $out/share/pixmaps/snapmaker-luban.png 66 + 67 + runHook postInstall 68 + ''; 69 + 70 + desktopItems = [ 71 + (makeDesktopItem { 72 + name = pname; 73 + exec = "snapmaker-luban"; 74 + icon = "snapmaker-luban"; 75 + desktopName = "Snapmaker Luban"; 76 + genericName = meta.description; 77 + categories = "Office;Printing;"; 78 + }) 79 + ]; 80 + 81 + meta = with lib; { 82 + description = "Snapmaker Luban is an easy-to-use 3-in-1 software tailor-made for Snapmaker machines"; 83 + homepage = "https://github.com/Snapmaker/Luban"; 84 + license = licenses.gpl3; 85 + maintainers = [ maintainers.simonkampe ]; 86 + platforms = [ "x86_64-linux" ]; 87 + }; 88 + }
+90
pkgs/applications/networking/cisco-packet-tracer/7.nix
··· 1 + { stdenv 2 + , lib 3 + , buildFHSUserEnvBubblewrap 4 + , callPackage 5 + , copyDesktopItems 6 + , dpkg 7 + , lndir 8 + , makeDesktopItem 9 + , makeWrapper 10 + , requireFile 11 + }: 12 + 13 + let 14 + version = "7.3.1"; 15 + 16 + ptFiles = stdenv.mkDerivation { 17 + name = "PacketTracer7drv"; 18 + inherit version; 19 + 20 + dontUnpack = true; 21 + src = requireFile { 22 + name = "PacketTracer_${builtins.replaceStrings ["."] [""] version}_amd64.deb"; 23 + sha256 = "c39802d15dd61d00ba27fb8c116da45fd8562ab4b49996555ad66b88deace27f"; 24 + url = "https://www.netacad.com"; 25 + }; 26 + 27 + nativeBuildInputs = [ dpkg makeWrapper ]; 28 + 29 + installPhase = '' 30 + dpkg-deb -x $src $out 31 + makeWrapper "$out/opt/pt/bin/PacketTracer7" "$out/bin/packettracer7" \ 32 + --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" 33 + ''; 34 + }; 35 + 36 + desktopItem = makeDesktopItem { 37 + name = "cisco-pt7.desktop"; 38 + desktopName = "Cisco Packet Tracer 7"; 39 + icon = "${ptFiles}/opt/pt/art/app.png"; 40 + exec = "packettracer7 %f"; 41 + mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; 42 + }; 43 + 44 + fhs = buildFHSUserEnvBubblewrap { 45 + name = "packettracer7"; 46 + runScript = "${ptFiles}/bin/packettracer7"; 47 + 48 + targetPkgs = pkgs: with pkgs; [ 49 + alsa-lib 50 + dbus 51 + expat 52 + fontconfig 53 + glib 54 + libglvnd 55 + libpulseaudio 56 + libudev0-shim 57 + libxkbcommon 58 + libxml2 59 + libxslt 60 + nspr 61 + nss 62 + xorg.libICE 63 + xorg.libSM 64 + xorg.libX11 65 + xorg.libXScrnSaver 66 + ]; 67 + }; 68 + in stdenv.mkDerivation { 69 + pname = "ciscoPacketTracer7"; 70 + inherit version; 71 + 72 + dontUnpack = true; 73 + 74 + installPhase = '' 75 + mkdir $out 76 + ${lndir}/bin/lndir -silent ${fhs} $out 77 + ''; 78 + 79 + desktopItems = [ desktopItem ]; 80 + 81 + nativeBuildInputs = [ copyDesktopItems ]; 82 + 83 + meta = with lib; { 84 + description = "Network simulation tool from Cisco"; 85 + homepage = "https://www.netacad.com/courses/packet-tracer"; 86 + license = licenses.unfree; 87 + maintainers = with maintainers; [ lucasew ]; 88 + platforms = [ "x86_64-linux" ]; 89 + }; 90 + }
+131
pkgs/applications/networking/cisco-packet-tracer/8.nix
··· 1 + { stdenv 2 + , lib 3 + , alsa-lib 4 + , autoPatchelfHook 5 + , buildFHSUserEnvBubblewrap 6 + , callPackage 7 + , copyDesktopItems 8 + , dbus 9 + , dpkg 10 + , expat 11 + , fontconfig 12 + , glib 13 + , libdrm 14 + , libglvnd 15 + , libpulseaudio 16 + , libudev0-shim 17 + , libxkbcommon 18 + , libxml2 19 + , libxslt 20 + , lndir 21 + , makeDesktopItem 22 + , makeWrapper 23 + , nspr 24 + , nss 25 + , requireFile 26 + , xorg 27 + }: 28 + 29 + let 30 + version = "8.0.1"; 31 + 32 + ptFiles = stdenv.mkDerivation { 33 + name = "PacketTracer8Drv"; 34 + inherit version; 35 + 36 + dontUnpack = true; 37 + src = requireFile { 38 + name = "CiscoPacketTracer_${builtins.replaceStrings ["."] [""] version}_Ubuntu_64bit.deb"; 39 + sha256 = "77a25351b016faed7c78959819c16c7013caa89c6b1872cb888cd96edd259140"; 40 + url = "https://www.netacad.com"; 41 + }; 42 + 43 + nativeBuildInputs = [ 44 + alsa-lib 45 + autoPatchelfHook 46 + dbus 47 + dpkg 48 + expat 49 + fontconfig 50 + glib 51 + libdrm 52 + libglvnd 53 + libpulseaudio 54 + libudev0-shim 55 + libxkbcommon 56 + libxml2 57 + libxslt 58 + makeWrapper 59 + nspr 60 + nss 61 + ] ++ (with xorg; [ 62 + libICE 63 + libSM 64 + libX11 65 + libxcb 66 + libXcomposite 67 + libXcursor 68 + libXdamage 69 + libXext 70 + libXfixes 71 + libXi 72 + libXrandr 73 + libXrender 74 + libXScrnSaver 75 + xcbutilimage 76 + xcbutilkeysyms 77 + xcbutilrenderutil 78 + xcbutilwm 79 + ]); 80 + 81 + installPhase = '' 82 + dpkg-deb -x $src $out 83 + chmod 755 "$out" 84 + makeWrapper "$out/opt/pt/bin/PacketTracer" "$out/bin/packettracer" \ 85 + --prefix LD_LIBRARY_PATH : "$out/opt/pt/bin" 86 + 87 + # Keep source archive cached, to avoid re-downloading 88 + ln -s $src $out/usr/share/ 89 + ''; 90 + }; 91 + 92 + desktopItem = makeDesktopItem { 93 + name = "cisco-pt8.desktop"; 94 + desktopName = "Cisco Packet Tracer 8"; 95 + icon = "${ptFiles}/opt/pt/art/app.png"; 96 + exec = "packettracer8 %f"; 97 + mimeType = "application/x-pkt;application/x-pka;application/x-pkz;"; 98 + }; 99 + 100 + fhs = buildFHSUserEnvBubblewrap { 101 + name = "packettracer8"; 102 + runScript = "${ptFiles}/bin/packettracer"; 103 + targetPkgs = pkgs: [ libudev0-shim ]; 104 + 105 + extraInstallCommands = '' 106 + mkdir -p "$out/share/applications" 107 + cp "${desktopItem}"/share/applications/* "$out/share/applications/" 108 + ''; 109 + }; 110 + in stdenv.mkDerivation { 111 + pname = "ciscoPacketTracer8"; 112 + inherit version; 113 + 114 + dontUnpack = true; 115 + 116 + installPhase = '' 117 + mkdir $out 118 + ${lndir}/bin/lndir -silent ${fhs} $out 119 + ''; 120 + 121 + desktopItems = [ desktopItem ]; 122 + nativeBuildInputs = [ copyDesktopItems ]; 123 + 124 + meta = with lib; { 125 + description = "Network simulation tool from Cisco"; 126 + homepage = "https://www.netacad.com/courses/packet-tracer"; 127 + license = licenses.unfree; 128 + maintainers = with maintainers; [ lucasew ]; 129 + platforms = [ "x86_64-linux" ]; 130 + }; 131 + }
+4
pkgs/applications/networking/instant-messengers/jami/client-gnome.nix
··· 39 39 dontWrapGApps = true; 40 40 preFixup = '' 41 41 qtWrapperArgs+=("''${gappsWrapperArgs[@]}") 42 + # Users that set CLUTTER_BACKEND=wayland in their default environment will 43 + # encounter a segfault due to: 44 + # https://git.jami.net/savoirfairelinux/jami-client-gnome/-/issues/1100 . 45 + qtWrapperArgs+=("--unset" "CLUTTER_BACKEND") 42 46 ''; 43 47 44 48 buildInputs = [
+4
pkgs/applications/networking/instant-messengers/jami/daemon.nix
··· 49 49 ++ lib.optionals stdenv.isLinux (readLinesToList ./config/ffmpeg_args_linux) 50 50 ++ lib.optionals (stdenv.isx86_32 || stdenv.isx86_64) (readLinesToList ./config/ffmpeg_args_x86); 51 51 outputs = [ "out" "doc" ]; 52 + meta = old.meta // { 53 + # undefined reference to `ff_nlmeans_init_aarch64' 54 + broken = stdenv.isAarch64; 55 + }; 52 56 }); 53 57 54 58 pjsip-jami = pjsip.overrideAttrs (old:
+1 -1
pkgs/applications/networking/zerobin/default.nix
··· 40 40 # relax version constraints of some dependencies 41 41 substituteInPlace setup.cfg \ 42 42 --replace "clize==4.1.1" "clize" \ 43 - --replace "bleach==3.1.5" "bleach>=3.1.5,<4" \ 43 + --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \ 44 44 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \ 45 45 --replace "Paste==3.4.3" "Paste>=3.4.3,<4" 46 46 '';
+3 -3
pkgs/applications/science/medicine/xmedcon/default.nix
··· 10 10 11 11 stdenv.mkDerivation rec { 12 12 pname = "xmedcon"; 13 - version = "0.21.0"; 13 + version = "0.21.2"; 14 14 15 15 src = fetchurl { 16 16 url = "https://prdownloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2"; 17 - sha256 = "0yfnbrcil5i76z1wbg308pb1mnjbcxy6nih46qpqs038v1lhh4q8"; 17 + sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m"; 18 18 }; 19 19 20 20 buildInputs = [ ··· 31 31 homepage = "https://xmedcon.sourceforge.io/Main/HomePage"; 32 32 license = licenses.lgpl2Plus; 33 33 maintainers = with maintainers; [ arianvp flokli ]; 34 - platforms = with platforms; [ darwin linux ]; 34 + platforms = platforms.darwin ++ platforms.linux; 35 35 }; 36 36 }
+2 -2
pkgs/applications/virtualization/crun/default.nix
··· 37 37 in 38 38 stdenv.mkDerivation rec { 39 39 pname = "crun"; 40 - version = "1.2"; 40 + version = "1.3"; 41 41 42 42 src = fetchFromGitHub { 43 43 owner = "containers"; 44 44 repo = pname; 45 45 rev = version; 46 - sha256 = "sha256-7YDU7H4dVT6qI+Gt3bkm7vqHlU0Fr7ZhF4SWcA+RhYw="; 46 + sha256 = "sha256-c0jXhqYdEpt4De1Z6VNwyrv0KJcf039Wp3ye0oTW0Qc="; 47 47 fetchSubmodules = true; 48 48 }; 49 49
+13
pkgs/applications/window-managers/picom/picom-next.nix
··· 1 + { picom, lib, fetchFromGitHub }: 2 + 3 + picom.overrideAttrs (oldAttrs: rec { 4 + pname = "picom-next"; 5 + version = "unstable-2021-10-31"; 6 + src = fetchFromGitHub { 7 + owner = "yshui"; 8 + repo = "picom"; 9 + rev = "fade045eadf171d2c732820d6ebde7d1943a1397"; 10 + sha256 = "fPiLZ63+Bw5VCxVNqj9i5had2YLa+jFMMf85MYdqvHU="; 11 + }; 12 + meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; 13 + })
+35
pkgs/data/misc/v2ray-domain-list-community/default.nix
··· 1 + { stdenv, buildGoModule, fetchFromGitHub, lib }: 2 + 3 + let 4 + generator = buildGoModule rec { 5 + pname = "v2ray-domain-list-community"; 6 + version = "20211103073737"; 7 + src = fetchFromGitHub { 8 + owner = "v2fly"; 9 + repo = "domain-list-community"; 10 + rev = version; 11 + sha256 = "sha256-NYgEXbow16w+XMRjbQG1cIn/BjPbbcj+uzb4kcVR6eI="; 12 + }; 13 + vendorSha256 = "sha256-JuLU9v1ukVfAEtz07tGk66st1+sO4SBz83BlK3IPQwU="; 14 + meta = with lib; { 15 + description = "community managed domain list"; 16 + homepage = "https://github.com/v2fly/domain-list-community"; 17 + license = licenses.mit; 18 + maintainers = with maintainers; [ nickcao ]; 19 + }; 20 + }; 21 + in 22 + stdenv.mkDerivation { 23 + inherit (generator) pname version src meta; 24 + buildPhase = '' 25 + runHook preBuild 26 + ${generator}/bin/domain-list-community -datapath $src/data --exportlists=category-ads-all,tld-cn,cn,tld-\!cn,geolocation-\!cn,apple,icloud 27 + runHook postBuild 28 + ''; 29 + installPhase = '' 30 + runHook preInstall 31 + install -Dm644 dlc.dat $out/share/v2ray/geosite.dat 32 + runHook postInstall 33 + ''; 34 + passthru.generator = generator; 35 + }
+2 -1
pkgs/development/coq-modules/coqeal/default.nix
··· 10 10 11 11 inherit version; 12 12 defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ 13 - { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.0.6"; } 13 + { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.0"; } 14 14 { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } 15 15 { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; } 16 16 { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; } 17 17 ] null; 18 18 19 + release."1.1.0".sha256 = "1vyhfna5frkkq2fl1fkg2mwzpg09k3sbzxxpyp14fjay81xajrxr"; 19 20 release."1.0.6".sha256 = "0lqkyfj4qbq8wr3yk8qgn7mclw582n3fjl9l19yp8cnchspzywx0"; 20 21 release."1.0.5".sha256 = "0cmvky8glb5z2dy3q62aln6qbav4lrf2q1589f6h1gn5bgjrbzkm"; 21 22 release."1.0.4".sha256 = "1g5m26lr2lwxh6ld2gykailhay4d0ayql4bfh0aiwqpmmczmxipk";
+75 -25
pkgs/development/libraries/arrow-cpp/default.nix
··· 1 - { stdenv, lib, fetchurl, fetchFromGitHub, fixDarwinDylibNames 2 - , autoconf, boost, brotli, cmake, flatbuffers, gflags, glog, gtest, jemalloc 3 - , lz4, perl, python3, rapidjson, re2, snappy, thrift, tzdata , utf8proc, which 4 - , zlib, zstd 1 + { stdenv 2 + , lib 3 + , fetchurl 4 + , fetchFromGitHub 5 + , fixDarwinDylibNames 6 + , autoconf 7 + , aws-sdk-cpp 8 + , boost 9 + , brotli 10 + , c-ares 11 + , cmake 12 + , flatbuffers 13 + , gflags 14 + , glog 15 + , grpc 16 + , gtest 17 + , jemalloc 18 + , libnsl 19 + , lz4 20 + , minio 21 + , openssl 22 + , perl 23 + , protobuf 24 + , python3 25 + , rapidjson 26 + , re2 27 + , snappy 28 + , thrift 29 + , tzdata 30 + , utf8proc 31 + , which 32 + , zlib 33 + , zstd 5 34 , enableShared ? !stdenv.hostPlatform.isStatic 35 + , enableFlight ? !stdenv.isDarwin # libnsl is not supported on darwin 36 + , enableS3 ? true 6 37 }: 7 38 8 39 let ··· 20 51 hash = "sha256-GmOAS8gGhzDI0WzORMkWHRRUl/XBwmNen2d3VefZxxc="; 21 52 }; 22 53 23 - in stdenv.mkDerivation rec { 54 + in 55 + stdenv.mkDerivation rec { 24 56 pname = "arrow-cpp"; 25 57 version = "6.0.0"; 26 58 ··· 78 110 ] ++ lib.optionals enableShared [ 79 111 python3.pkgs.python 80 112 python3.pkgs.numpy 81 - ]; 113 + ] ++ lib.optionals enableFlight [ 114 + grpc 115 + libnsl 116 + openssl 117 + protobuf 118 + ] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ]; 82 119 83 120 preConfigure = '' 84 121 patchShebangs build-support/ ··· 113 150 # Parquet options: 114 151 "-DARROW_PARQUET=ON" 115 152 "-DPARQUET_BUILD_EXECUTABLES=ON" 153 + "-DARROW_FLIGHT=${if enableFlight then "ON" else "OFF"}" 154 + "-DARROW_S3=${if enableS3 then "ON" else "OFF"}" 116 155 ] ++ lib.optionals (!enableShared) [ 117 156 "-DARROW_TEST_LINKAGE=static" 118 157 ] ++ lib.optionals stdenv.isDarwin [ 119 158 "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests 120 159 "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables 121 - ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF"; 160 + ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" 161 + ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"; 122 162 123 163 doInstallCheck = true; 124 - ARROW_TEST_DATA = 125 - if doInstallCheck then "${arrow-testing}/data" else null; 126 - PARQUET_TEST_DATA = 127 - if doInstallCheck then "${parquet-testing}/data" else null; 164 + ARROW_TEST_DATA = lib.optionalString doInstallCheck "${arrow-testing}/data"; 165 + PARQUET_TEST_DATA = lib.optionalString doInstallCheck "${parquet-testing}/data"; 128 166 GTEST_FILTER = 129 - if doInstallCheck then let 167 + let 130 168 # Upstream Issue: https://issues.apache.org/jira/browse/ARROW-11398 131 169 filteredTests = lib.optionals stdenv.hostPlatform.isAarch64 [ 132 170 "TestFilterKernelWithNumeric/3.CompareArrayAndFilterRandomNumeric" 133 171 "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric" 134 172 "TestCompareKernel.PrimitiveRandomTests" 173 + ] ++ lib.optionals enableS3 [ 174 + "S3RegionResolutionTest.PublicBucket" 175 + "S3RegionResolutionTest.RestrictedBucket" 176 + "S3RegionResolutionTest.NonExistentBucket" 177 + "S3OptionsTest.FromUri" 178 + "TestMinioServer.Connect" 135 179 ]; 136 - in "-${builtins.concatStringsSep ":" filteredTests}" else null; 137 - installCheckInputs = [ perl which ]; 180 + in 181 + lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; 182 + installCheckInputs = [ perl which ] ++ lib.optional enableS3 minio; 138 183 installCheckPhase = 139 - let 140 - excludedTests = lib.optionals stdenv.isDarwin [ 141 - # Some plasma tests need to be patched to use a shorter AF_UNIX socket 142 - # path on Darwin. See https://github.com/NixOS/nix/pull/1085 143 - "plasma-external-store-tests" 144 - "plasma-client-tests" 145 - ]; 146 - in '' 147 - ctest -L unittest -V \ 148 - --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' 149 - ''; 184 + let 185 + excludedTests = lib.optionals stdenv.isDarwin [ 186 + # Some plasma tests need to be patched to use a shorter AF_UNIX socket 187 + # path on Darwin. See https://github.com/NixOS/nix/pull/1085 188 + "plasma-external-store-tests" 189 + "plasma-client-tests" 190 + ]; 191 + in 192 + '' 193 + runHook preInstallCheck 194 + 195 + ctest -L unittest -V \ 196 + --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' 197 + 198 + runHook postInstallCheck 199 + ''; 150 200 151 201 meta = with lib; { 152 202 description = "A cross-language development platform for in-memory data";
+56 -4
pkgs/development/libraries/google-cloud-cpp/default.nix
··· 6 6 , cmake 7 7 , crc32c 8 8 , curl 9 - , grpc 10 9 , gbenchmark 10 + , grpc 11 11 , gtest 12 12 , ninja 13 13 , nlohmann_json ··· 15 15 , protobuf 16 16 # default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173 17 17 , apis ? [ "*" ] 18 + , staticOnly ? stdenv.hostPlatform.isStatic 18 19 }: 19 20 let 20 21 googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435"; ··· 24 25 rev = googleapisRev; 25 26 hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl"; 26 27 }; 28 + excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); 27 29 in 28 30 stdenv.mkDerivation rec { 29 31 pname = "google-cloud-cpp"; ··· 45 47 cmake 46 48 ninja 47 49 pkg-config 50 + ] ++ lib.optionals (!doInstallCheck) [ 51 + # enable these dependencies when doInstallCheck failse because we're 52 + # unconditionally building tests and benchmarks 53 + # 54 + # when doInstallCheck is true, these deps are added to installCheckInputs 55 + gbenchmark 56 + gtest 48 57 ]; 49 58 50 59 buildInputs = [ ··· 53 62 crc32c 54 63 curl 55 64 grpc 56 - gbenchmark 57 - gtest 58 65 nlohmann_json 59 66 protobuf 60 67 ]; 61 68 69 + doInstallCheck = true; 70 + 71 + preInstallCheck = 72 + let 73 + # These paths are added to (DY)LD_LIBRARY_PATH because they contain 74 + # testing-only shared libraries that do not need to be installed, but 75 + # need to be loadable by the test executables. 76 + # 77 + # Setting (DY)LD_LIBRARY_PATH is only necessary when building shared libraries. 78 + additionalLibraryPaths = [ 79 + "$PWD/google/cloud/bigtable" 80 + "$PWD/google/cloud/bigtable/benchmarks" 81 + "$PWD/google/cloud/pubsub" 82 + "$PWD/google/cloud/spanner" 83 + "$PWD/google/cloud/spanner/benchmarks" 84 + "$PWD/google/cloud/storage" 85 + "$PWD/google/cloud/storage/benchmarks" 86 + "$PWD/google/cloud/testing_util" 87 + ]; 88 + ldLibraryPathName = "${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH"; 89 + in 90 + lib.optionalString doInstallCheck ( 91 + lib.optionalString (!staticOnly) '' 92 + export ${ldLibraryPathName}=${lib.concatStringsSep ":" additionalLibraryPaths} 93 + '' + '' 94 + export GTEST_FILTER="-${lib.concatStringsSep ":" excludedTests.cases}" 95 + '' 96 + ); 97 + 98 + installCheckPhase = lib.optionalString doInstallCheck '' 99 + runHook preInstallCheck 100 + 101 + # disable tests that contact the internet 102 + ctest --exclude-regex '^(${lib.concatStringsSep "|" excludedTests.whole})' 103 + 104 + runHook postInstallCheck 105 + ''; 106 + 107 + installCheckInputs = lib.optionals doInstallCheck [ 108 + gbenchmark 109 + gtest 110 + ]; 111 + 62 112 cmakeFlags = [ 63 - "-DBUILD_SHARED_LIBS:BOOL=ON" 113 + "-DBUILD_SHARED_LIBS:BOOL=${if staticOnly then "OFF" else "ON"}" 114 + # unconditionally build tests to catch linker errors as early as possible 115 + # this adds a good chunk of time to the build 64 116 "-DBUILD_TESTING:BOOL=ON" 65 117 "-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES:BOOL=OFF" 66 118 ] ++ lib.optionals (apis != [ "*" ]) [
+112
pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml
··· 1 + whole = [ 2 + "bigquery_bigquery_read_integration_test", 3 + "bigtable_admin_backup_integration_test", 4 + "bigtable_admin_iam_policy_integration_test", 5 + "bigtable_admin_integration_test", 6 + "bigtable_apply_read_latency_benchmark", 7 + "bigtable_data_async_future_integration_test", 8 + "bigtable_data_integration_test", 9 + "bigtable_endurance_benchmark", 10 + "bigtable_filters_integration_test", 11 + "bigtable_mutation_batcher_throughput_benchmark", 12 + "bigtable_mutations_integration_test", 13 + "bigtable_read_sync_vs_async_benchmark", 14 + "bigtable_scan_throughput_benchmark", 15 + "bigtable_table_sample_rows_integration_test", 16 + "iam_iam_credentials_integration_test", 17 + "iam_iam_integration_test", 18 + "pubsub_endurance", 19 + "pubsub_schema_admin_integration_test", 20 + "pubsub_subscriber_integration_test", 21 + "pubsub_subscription_admin_integration_test", 22 + "pubsub_throughput", 23 + "pubsub_topic_admin_integration_test", 24 + "spanner_admin_backup_extra_integration_test", 25 + "spanner_admin_database_admin_integration_test", 26 + "spanner_admin_instance_admin_integration_test", 27 + "spanner_backup_extra_integration_test", 28 + "spanner_client_integration_test", 29 + "spanner_client_stress_test", 30 + "spanner_data_types_integration_test", 31 + "spanner_database_admin_integration_test", 32 + "spanner_instance_admin_integration_test", 33 + "spanner_multiple_rows_cpu_benchmark", 34 + "spanner_rpc_failure_threshold_integration_test", 35 + "spanner_session_pool_integration_test", 36 + "spanner_single_row_throughput_benchmark", 37 + "storage_aggregate_download_throughput_benchmark", 38 + "storage_aggregate_upload_throughput_benchmark", 39 + "storage_alternative_endpoint_integration_test", 40 + "storage_auto_finalize_integration_test", 41 + "storage_bucket_integration_test", 42 + "storage_create_client_integration_test", 43 + "storage_create_dataset", 44 + "storage_curl_download_request_integration_test", 45 + "storage_curl_request_integration_test", 46 + "storage_curl_resumable_upload_session_integration_test", 47 + "storage_curl_sign_blob_integration_test", 48 + "storage_grpc_integration_test", 49 + "storage_key_file_integration_test", 50 + "storage_minimal_iam_credentials_rest_integration_test", 51 + "storage_object_basic_crud_integration_test", 52 + "storage_object_checksum_integration_test", 53 + "storage_object_compose_many_integration_test", 54 + "storage_object_file_integration_test", 55 + "storage_object_hash_integration_test", 56 + "storage_object_insert_integration_test", 57 + "storage_object_insert_preconditions_integration_test", 58 + "storage_object_integration_test", 59 + "storage_object_list_objects_versions_integration_test", 60 + "storage_object_media_integration_test", 61 + "storage_object_parallel_upload_integration_test", 62 + "storage_object_plenty_clients_serially_integration_test", 63 + "storage_object_plenty_clients_simultaneously_integration_test", 64 + "storage_object_read_headers_integration_test", 65 + "storage_object_read_preconditions_integration_test", 66 + "storage_object_read_range_integration_test", 67 + "storage_object_read_stream_integration_test", 68 + "storage_object_resumable_parallel_upload_integration_test", 69 + "storage_object_resumable_write_integration_test", 70 + "storage_object_rewrite_integration_test", 71 + "storage_object_write_preconditions_integration_test", 72 + "storage_object_write_stream_integration_test", 73 + "storage_object_write_streambuf_integration_test", 74 + "storage_service_account_integration_test", 75 + "storage_signed_url_integration_test", 76 + "storage_small_reads_integration_test", 77 + "storage_storage_file_transfer_benchmark", 78 + "storage_storage_parallel_uploads_benchmark", 79 + "storage_storage_throughput_vs_cpu_benchmark", 80 + "storage_thread_integration_test", 81 + "storage_throughput_experiment_test", 82 + "storage_tracing_integration_test", 83 + "storage_unified_credentials_integration_test", 84 + "common_grpc_utils_internal_grpc_impersonate_service_account_integration_test" 85 + ] 86 + cases = [ 87 + "BackupExtraIntegrationTest.CreateBackupWithExpiredVersionTime", 88 + "BackupExtraIntegrationTest.BackupWithExpiredVersionTime", 89 + "BackupExtraIntegrationTest.BackupWithFutureVersionTime", 90 + "BackupExtraIntegrationTest.CreateBackupWithFutureVersionTime", 91 + "DatabaseAdminClientTest.CreateWithEncryptionKey", 92 + "DatabaseAdminClientTest.CreateWithNonexistentEncryptionKey", 93 + "DatabaseAdminClientTest.DatabaseBasicCRUD", 94 + "DatabaseAdminClientTest.VersionRetentionPeriodCreate", 95 + "DatabaseAdminClientTest.VersionRetentionPeriodCreateFailure", 96 + "DatabaseAdminClientTest.VersionRetentionPeriodUpdate", 97 + "DatabaseAdminClientTest.VersionRetentionPeriodUpdateFailure", 98 + "InstanceAdminClientTest.InstanceConfig", 99 + "InstanceAdminClientTest.InstanceIam", 100 + "InstanceAdminClientTest.InstanceReadOperations", 101 + "LoggingIntegrationTest.ListMonitoredResourceDescriptors", 102 + "LoggingIntegrationTest.WriteLogEntries", 103 + "ObjectFileMultiThreadedTest.Download", 104 + "SubscriberIntegrationTest.FireAndForget", 105 + "SubscriberIntegrationTest.PublishOrdered", 106 + "SubscriberIntegrationTest.PublishPullAck", 107 + "SubscriberIntegrationTest.RawStub", 108 + "SubscriberIntegrationTest.ReportNotFound", 109 + "SubscriberIntegrationTest.StreamingSubscriptionBatchSource", 110 + "SubscriptionAdminIntegrationTest.SubscriptionCRUD", 111 + "TopicAdminIntegrationTest.TopicCRUD" 112 + ]
pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs-darwin.patch pkgs/development/libraries/openssl/use-etc-ssl-certs-darwin.patch
pkgs/development/libraries/openssl/1.1/use-etc-ssl-certs.patch pkgs/development/libraries/openssl/use-etc-ssl-certs.patch
+15
pkgs/development/libraries/openssl/3.0/nix-ssl-cert-file.patch
··· 1 + diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c 2 + index 37d73ca84c..e328896234 100644 3 + --- a/crypto/x509/by_file.c 4 + +++ b/crypto/x509/by_file.c 5 + @@ -54,7 +54,9 @@ static int by_file_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argp, 6 + switch (cmd) { 7 + case X509_L_FILE_LOAD: 8 + if (argl == X509_FILETYPE_DEFAULT) { 9 + - file = ossl_safe_getenv(X509_get_default_cert_file_env()); 10 + + file = ossl_safe_getenv("NIX_SSL_CERT_FILE"); 11 + + if (!file) 12 + + file = ossl_safe_getenv(X509_get_default_cert_file_env()); 13 + if (file) 14 + ok = (X509_load_cert_crl_file_ex(ctx, file, X509_FILETYPE_PEM, 15 + libctx, propq) != 0);
+22
pkgs/development/libraries/openssl/3.0/openssl-disable-kernel-detection.patch
··· 1 + diff --git a/Configure b/Configure 2 + index f0ad787bc4..a48d2008c6 100755 3 + --- a/Configure 4 + +++ b/Configure 5 + @@ -1688,17 +1688,6 @@ unless ($disabled{devcryptoeng}) { 6 + unless ($disabled{ktls}) { 7 + $config{ktls}=""; 8 + if ($target =~ m/^linux/) { 9 + - my $usr = "/usr/$config{cross_compile_prefix}"; 10 + - chop($usr); 11 + - if ($config{cross_compile_prefix} eq "") { 12 + - $usr = "/usr"; 13 + - } 14 + - my $minver = (4 << 16) + (13 << 8) + 0; 15 + - my @verstr = split(" ",`cat $usr/include/linux/version.h | grep LINUX_VERSION_CODE`); 16 + - 17 + - if ($verstr[2] < $minver) { 18 + - disable('too-old-kernel', 'ktls'); 19 + - } 20 + } elsif ($target =~ m/^BSD/) { 21 + my $cc = $config{CROSS_COMPILE}.$config{CC}; 22 + system("printf '#include <sys/types.h>\n#include <sys/ktls.h>' | $cc -E - >/dev/null 2>&1");
+24 -2
pkgs/development/libraries/openssl/default.nix
··· 198 198 ./1.1/nix-ssl-cert-file.patch 199 199 200 200 (if stdenv.hostPlatform.isDarwin 201 - then ./1.1/use-etc-ssl-certs-darwin.patch 202 - else ./1.1/use-etc-ssl-certs.patch) 201 + then ./use-etc-ssl-certs-darwin.patch 202 + else ./use-etc-ssl-certs.patch) 203 203 ] ++ lib.optionals (stdenv.isDarwin) [ 204 204 ./1.1/macos-yosemite-compat.patch 205 205 ]; 206 206 withDocs = true; 207 + }; 208 + 209 + openssl_3_0 = common { 210 + version = "3.0.0"; 211 + sha256 = "sha256-We7fy0bCUhTJvTftYHgpe03wHQEiZ/6enu4x9hvHBTY="; 212 + patches = [ 213 + ./3.0/nix-ssl-cert-file.patch 214 + 215 + # openssl will only compile in KTLS if the current kernel supports it. 216 + # This patch disables build-time detection. 217 + ./3.0/openssl-disable-kernel-detection.patch 218 + 219 + (if stdenv.hostPlatform.isDarwin 220 + then ./use-etc-ssl-certs-darwin.patch 221 + else ./use-etc-ssl-certs.patch) 222 + ]; 223 + 224 + withDocs = true; 225 + 226 + extraMeta = with lib; { 227 + license = licenses.asl20; 228 + }; 207 229 }; 208 230 }
+2
pkgs/development/python-modules/tern/default.nix
··· 12 12 , GitPython 13 13 , prettytable 14 14 , idna 15 + , packageurl-python 15 16 }: 16 17 17 18 buildPythonPackage rec { ··· 42 43 GitPython 43 44 prettytable 44 45 idna 46 + packageurl-python 45 47 ]; 46 48 47 49 # No tests
+78
pkgs/development/tools/misc/netcoredbg/default.nix
··· 1 + { lib, clangStdenv, stdenvNoCC, cmake, fetchFromGitHub, dotnetCorePackages, buildDotnetModule }: 2 + let 3 + pname = "netcoredbg"; 4 + version = "1.2.0-825"; 5 + 6 + # according to CMakeLists.txt, this should be 3.1 even when building for .NET 5 7 + coreclr-version = "3.1.19"; 8 + coreclr-src = fetchFromGitHub { 9 + owner = "dotnet"; 10 + repo = "coreclr"; 11 + rev = "v${coreclr-version}"; 12 + sha256 = "o1KafmXqNjX9axr6sSxPKrfUX0e+b/4ANiVQt4T2ybw="; 13 + }; 14 + 15 + dotnet-sdk = dotnetCorePackages.sdk_5_0; 16 + 17 + src = fetchFromGitHub { 18 + owner = "Samsung"; 19 + repo = pname; 20 + rev = version; 21 + sha256 = "JQhDI1+bVbOIFNkXixZnFB/5+dzqCbInR0zJvykcFCg="; 22 + }; 23 + 24 + unmanaged = clangStdenv.mkDerivation rec { 25 + inherit src pname version; 26 + 27 + nativeBuildInputs = [ cmake ]; 28 + 29 + # Building the "unmanaged part" still involves compiling C# code. 30 + preBuild = '' 31 + export HOME=$(mktemp -d) 32 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 33 + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 34 + ''; 35 + 36 + hardeningDisable = [ "strictoverflow" ]; 37 + 38 + preConfigure = '' 39 + dotnetVersion="$(${dotnet-sdk}/bin/dotnet --list-runtimes | grep -Po '^Microsoft.NETCore.App \K.*?(?= )')" 40 + cmakeFlagsArray+=( 41 + "-DDBGSHIM_RUNTIME_DIR=${dotnet-sdk}/shared/Microsoft.NETCore.App/$dotnetVersion" 42 + ) 43 + ''; 44 + 45 + cmakeFlags = [ 46 + "-DCORECLR_DIR=${coreclr-src}" 47 + "-DDOTNET_DIR=${dotnet-sdk}" 48 + "-DBUILD_MANAGED=0" 49 + ]; 50 + }; 51 + 52 + managed = buildDotnetModule { 53 + inherit pname version src dotnet-sdk; 54 + 55 + projectFile = "src/managed/ManagedPart.csproj"; 56 + nugetDeps = ./deps.nix; 57 + 58 + executables = [ ]; 59 + }; 60 + in 61 + stdenvNoCC.mkDerivation { 62 + inherit pname version; 63 + 64 + buildCommand = '' 65 + mkdir -p $out/share/netcoredbg $out/bin 66 + cp ${unmanaged}/* $out/share/netcoredbg 67 + cp ${managed}/lib/netcoredbg/* $out/share/netcoredbg 68 + ln -s $out/share/netcoredbg/netcoredbg $out/bin/netcoredbg 69 + ''; 70 + 71 + meta = with lib; { 72 + description = "Managed code debugger with MI interface for CoreCLR"; 73 + homepage = "https://github.com/Samsung/netcoredbg"; 74 + license = licenses.mit; 75 + platforms = platforms.unix; 76 + maintainers = [ maintainers.leo60228 ]; 77 + }; 78 + }
+84
pkgs/development/tools/misc/netcoredbg/deps.nix
··· 1 + { fetchNuGet }: [ 2 + (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) 3 + (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "2.3.0"; sha256 = "1p29v4499qpyh7k7fv1li2y3c688zg95ic8gq9if1nqmjciz5w7p"; }) 4 + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "2.3.0"; sha256 = "1g893rqc8hmd59hdigq0fwm3w261i7cm1h2wciqp7406f0gz67x5"; }) 5 + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "2.3.0"; sha256 = "121dhnfjd5jzm410dk79s8xk5jvd09xa0w5q3lbpqc7bs4wxmq4p"; }) 6 + (fetchNuGet { name = "Microsoft.CodeAnalysis.Scripting.Common"; version = "2.3.0"; sha256 = "11f11kvgrdgs86ykz4104jx1iw78v6af48hpdrhmr7y7h5334ziq"; }) 7 + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.4.0"; sha256 = "1niyzqqfyhvh4zpxn8bcyyldynqlw0rfr1apwry4b3yrdnjh1hhh"; }) 8 + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) 9 + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) 10 + (fetchNuGet { name = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) 11 + (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) 12 + (fetchNuGet { name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) 13 + (fetchNuGet { name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) 14 + (fetchNuGet { name = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) 15 + (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) 16 + (fetchNuGet { name = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) 17 + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) 18 + (fetchNuGet { name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) 19 + (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) 20 + (fetchNuGet { name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) 21 + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) 22 + (fetchNuGet { name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) 23 + (fetchNuGet { name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) 24 + (fetchNuGet { name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) 25 + (fetchNuGet { name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) 26 + (fetchNuGet { name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) 27 + (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) 28 + (fetchNuGet { name = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) 29 + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) 30 + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) 31 + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.3.1"; sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; }) 32 + (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) 33 + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) 34 + (fetchNuGet { name = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) 35 + (fetchNuGet { name = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) 36 + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) 37 + (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) 38 + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) 39 + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) 40 + (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) 41 + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) 42 + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) 43 + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) 44 + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) 45 + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) 46 + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) 47 + (fetchNuGet { name = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) 48 + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) 49 + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) 50 + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) 51 + (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) 52 + (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) 53 + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.4.2"; sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; }) 54 + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) 55 + (fetchNuGet { name = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) 56 + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) 57 + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) 58 + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) 59 + (fetchNuGet { name = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) 60 + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) 61 + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) 62 + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) 63 + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) 64 + (fetchNuGet { name = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) 65 + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) 66 + (fetchNuGet { name = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) 67 + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) 68 + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) 69 + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) 70 + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.3.0"; sha256 = "0lgxg1gn7pg7j0f942pfdc9q7wamzxsgq3ng248ikdasxz0iadkv"; }) 71 + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) 72 + (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) 73 + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) 74 + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) 75 + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) 76 + (fetchNuGet { name = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) 77 + (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) 78 + (fetchNuGet { name = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; }) 79 + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) 80 + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) 81 + (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) 82 + (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) 83 + (fetchNuGet { name = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) 84 + ]
+3
pkgs/development/tools/ocaml/merlin/4.x.nix
··· 47 47 dot_merlin_reader = "${dot-merlin-reader}/bin/dot-merlin-reader"; 48 48 dune = "${dune_2}/bin/dune"; 49 49 }) 50 + # This fixes the test-suite on macOS 51 + # See https://github.com/ocaml/merlin/pull/1399 52 + ./test.patch 50 53 ]; 51 54 52 55 useDune2 = true;
+19
pkgs/development/tools/ocaml/merlin/test.patch
··· 1 + commit 282eed37f39ff216add8d53766fd59f3737eb87f 2 + Author: Vincent Laporte <Vincent.Laporte@gmail.com> 3 + Date: Thu Nov 4 06:24:07 2021 +0100 4 + 5 + Ignore dune stderr in tests 6 + 7 + diff --git a/tests/test-dirs/document/src-documentation.t/run.t b/tests/test-dirs/document/src-documentation.t/run.t 8 + index 2c9e1419..4f4c4327 100644 9 + --- a/tests/test-dirs/document/src-documentation.t/run.t 10 + +++ b/tests/test-dirs/document/src-documentation.t/run.t 11 + @@ -42,7 +42,7 @@ documentation for the non-last defined value (in the same file) is show 12 + > jq '.value' 13 + " List reversal. " 14 + 15 + - $ dune build --root=. ./doc.exe 16 + + $ dune build --root=. ./doc.exe 2> /dev/null 17 + $ cat >.merlin <<EOF 18 + > B _build/default/.doc.eobjs/byte 19 + > S .
+16 -10
pkgs/development/tools/rust/cargo-deny/default.nix
··· 1 - { stdenv 2 - , lib 1 + { lib 3 2 , rustPlatform 4 3 , fetchFromGitHub 5 - , perl, pkg-config, openssl, Security, libiconv, curl 4 + , pkg-config 5 + , openssl 6 + , stdenv 7 + , curl 8 + , Security 6 9 }: 7 10 8 11 rustPlatform.buildRustPackage rec { ··· 20 23 21 24 doCheck = false; 22 25 23 - nativeBuildInputs = [ perl pkg-config ]; 26 + nativeBuildInputs = [ pkg-config ]; 24 27 25 - buildInputs = [ openssl ] 26 - ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; 28 + buildInputs = [ openssl ] 29 + ++ lib.optionals stdenv.isDarwin [ curl Security ]; 30 + 31 + cargoBuildFlags = [ "--no-default-features" ]; 32 + 33 + cargoTestFlags = cargoBuildFlags; 27 34 28 35 meta = with lib; { 29 36 description = "Cargo plugin to generate list of all licenses for a crate"; 30 37 homepage = "https://github.com/EmbarkStudios/cargo-deny"; 31 - license = licenses.asl20; 32 - platforms = platforms.unix; 33 - maintainers = with maintainers; [ matthiasbeyer ]; 38 + changelog = "https://github.com/EmbarkStudios/cargo-deny/blob/${version}/CHANGELOG.md"; 39 + license = with licenses; [ asl20 /* or */ mit ]; 40 + maintainers = with maintainers; [ figsoda matthiasbeyer ]; 34 41 }; 35 42 } 36 -
+10 -5
pkgs/development/tools/rust/cargo-modules/default.nix
··· 1 - { lib, rustPlatform, fetchFromGitHub }: 1 + { lib, rustPlatform, fetchFromGitHub, stdenv, CoreFoundation, CoreServices }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "cargo-modules"; 5 - version = "0.5.0"; 5 + version = "0.5.6"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "regexident"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "0y6ag8nar85l2fh2ca41fglkzc74cv1p5szxrhk1jdqnd2qzhvjp"; 11 + sha256 = "sha256-bLljwxNrCmg1ZWfSninIxJIFIn2oHY8dmbHYPdwtD+M="; 12 12 }; 13 13 14 - cargoSha256 = "0m5r36p57w4vw2g3hg12s38ay328swjb0qfl381xwb2xqx10g8kx"; 14 + cargoSha256 = "sha256-heyVeQwEIOA9qtyXnHY8lPo06YgIUJaWCtaht9dWLoo="; 15 + 16 + buildInputs = lib.optionals stdenv.isDarwin [ 17 + CoreFoundation 18 + CoreServices 19 + ]; 15 20 16 21 meta = with lib; { 17 22 description = "A cargo plugin for showing a tree-like overview of a crate's modules"; 18 23 homepage = "https://github.com/regexident/cargo-modules"; 19 24 license = with licenses; [ mpl20 ]; 20 - maintainers = with maintainers; [ rvarago ]; 25 + maintainers = with maintainers; [ figsoda rvarago ]; 21 26 }; 22 27 }
+8 -8
pkgs/development/tools/rust/racer/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, substituteAll, Security }: 1 + { lib, rustPlatform, fetchCrate, makeWrapper, stdenv, Security }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "racer"; 5 - version = "2.1.46"; 5 + version = "2.1.48"; 6 6 7 - src = fetchFromGitHub { 8 - owner = "racer-rust"; 9 - repo = "racer"; 10 - rev = "v${version}"; 11 - sha256 = "sha256-7h1w5Yyt5VN6+pYuTTbdM1Nrd8aDEhPLusxuIsdS+mQ="; 7 + src = fetchCrate { 8 + inherit pname version; 9 + sha256 = "sha256-lat5s9+AMFI3VXiWqjLESZrtq3IwOZhlt+5BhYoonfA="; 12 10 }; 13 11 14 - cargoSha256 = "sha256-fllhB+so6H36b+joW0l+NBtz3PefOKdj6C8qKQPuJpk="; 12 + cargoSha256 = "sha256-jGsvCmrPGVzWdx7V3J4bBK+SF2o+icORmVKuwqYxdh4="; 15 13 16 14 nativeBuildInputs = [ makeWrapper ]; 17 15 buildInputs = lib.optional stdenv.isDarwin Security; ··· 44 42 homepage = "https://github.com/racer-rust/racer"; 45 43 license = licenses.mit; 46 44 maintainers = with maintainers; [ jagajaga ]; 45 + # error[E0199]: implementing the trait `Step` is not unsafe 46 + broken = true; 47 47 }; 48 48 }
+3 -3
pkgs/development/tools/selene/default.nix
··· 10 10 11 11 rustPlatform.buildRustPackage rec { 12 12 pname = "selene"; 13 - version = "0.14.0"; 13 + version = "0.15.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "kampfkarren"; 17 17 repo = pname; 18 18 rev = version; 19 - sha256 = "0c228aakwf679wyxir0jwry3khv7phlaf77w675gn1wr4fxdg5gr"; 19 + sha256 = "sha256-tA1exZ97N2tAagAljt+MOSGh6objOiqbZXUaBZ62Sls="; 20 20 }; 21 21 22 - cargoSha256 = "sha256-5GODuqjVo3b1SzRgXVBIKec2tSS335EAUAmRlcpbClE="; 22 + cargoSha256 = "sha256-4vCKiTWwnibNK6/S1GOYRurgm2Aq1e9o4rAmp0hqGeA="; 23 23 24 24 nativeBuildInputs = lib.optional robloxSupport pkg-config; 25 25
+2 -2
pkgs/development/tools/skopeo/default.nix
··· 14 14 15 15 buildGoModule rec { 16 16 pname = "skopeo"; 17 - version = "1.5.0"; 17 + version = "1.5.1"; 18 18 19 19 src = fetchFromGitHub { 20 20 rev = "v${version}"; 21 21 owner = "containers"; 22 22 repo = "skopeo"; 23 - sha256 = "sha256-75zrOYiwlpHbEgmpJ9THYKbF4sL4Jp009/+Fw12Wvys="; 23 + sha256 = "sha256-GaOfONUAN+bNSyodDbZyahMheU5fnjuAp4/94jy+9Hg="; 24 24 }; 25 25 26 26 outputs = [ "out" "man" ];
+5 -2
pkgs/development/tools/sumneko-lua-language-server/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "sumneko-lua-language-server"; 5 - version = "2.4.5"; 5 + version = "2.4.7"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "sumneko"; 9 9 repo = "lua-language-server"; 10 10 rev = version; 11 - sha256 = "sha256-7eTYHZDJLmYTwe0K+RJMRl4tRz9o0DeniHD5+v9f1Jw="; 11 + sha256 = "sha256-lO+FUuU7uihbRLI1X9qhOvgukRGfhDeSM/JdIqr96Fk="; 12 12 fetchSubmodules = true; 13 13 }; 14 14 ··· 37 37 install -m644 -t "$out"/share/lua-language-server/bin/Linux bin/Linux/*.* 38 38 install -m644 -t "$out"/share/lua-language-server {debugger,main}.lua 39 39 cp -r locale meta script "$out"/share/lua-language-server 40 + 41 + # necessary for --version to work: 42 + install -m644 -t "$out"/share/lua-language-server changelog.md 40 43 41 44 makeWrapper "$out"/share/lua-language-server/bin/Linux/lua-language-server \ 42 45 $out/bin/lua-language-server \
+25 -25
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 2 2 "4.14": { 3 3 "patch": { 4 4 "extra": "-hardened1", 5 - "name": "linux-hardened-4.14.252-hardened1.patch", 6 - "sha256": "1isqlqg4diz0i3f77rigvb07fs2p1v9w2h5165l0rnkb6h26i1gn", 7 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.252-hardened1/linux-hardened-4.14.252-hardened1.patch" 5 + "name": "linux-hardened-4.14.254-hardened1.patch", 6 + "sha256": "1mg4zims7ckb0ddnnahk1cj73lhdh7x7xkjz4cgsvwndw0qvmhdi", 7 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.254-hardened1/linux-hardened-4.14.254-hardened1.patch" 8 8 }, 9 - "sha256": "022rw51s8fzz6wcxa9xq6h60fglfx0hq7bmqgs5dlrci6plv4fwk", 10 - "version": "4.14.252" 9 + "sha256": "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz", 10 + "version": "4.14.254" 11 11 }, 12 12 "4.19": { 13 13 "patch": { 14 14 "extra": "-hardened1", 15 - "name": "linux-hardened-4.19.213-hardened1.patch", 16 - "sha256": "03lk4m6sm3545s0xxx0w4sqgrsvrxqm8qg7swn05s36jj20viprm", 17 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.213-hardened1/linux-hardened-4.19.213-hardened1.patch" 15 + "name": "linux-hardened-4.19.215-hardened1.patch", 16 + "sha256": "05m3x3aafwp9msmqb2h1mys54xlsq17477blhb0d3b3nyj3qv503", 17 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.215-hardened1/linux-hardened-4.19.215-hardened1.patch" 18 18 }, 19 - "sha256": "162f5y3jplql3ca5xy889mq6izjinryx2kx16zp582yvsqf8rwiq", 20 - "version": "4.19.213" 19 + "sha256": "1czjqa5wbsmzgl7wwqlp9qbdig45ibq11m9pcykrjaclrgwn884y", 20 + "version": "4.19.215" 21 21 }, 22 22 "5.10": { 23 23 "patch": { 24 24 "extra": "-hardened1", 25 - "name": "linux-hardened-5.10.75-hardened1.patch", 26 - "sha256": "17gm50aislxihfnmr4vi0p0gpg13m2pbldjpi81clnx93a7rrfw2", 27 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.75-hardened1/linux-hardened-5.10.75-hardened1.patch" 25 + "name": "linux-hardened-5.10.77-hardened1.patch", 26 + "sha256": "1y5rdd7irlljjsw7kdv6v8issbhab3hzywggz5igca72qiy7gcwl", 27 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.77-hardened1/linux-hardened-5.10.77-hardened1.patch" 28 28 }, 29 - "sha256": "0jrhhk89587caw54nhnwms93kq33qdm75x5f18cp61xrxxgjyaqa", 30 - "version": "5.10.75" 29 + "sha256": "1hwgbcfv9wfx9ka25lsqjrnzskynfgmswcyp5vk14wnxq7glxdnk", 30 + "version": "5.10.77" 31 31 }, 32 32 "5.14": { 33 33 "patch": { 34 34 "extra": "-hardened1", 35 - "name": "linux-hardened-5.14.14-hardened1.patch", 36 - "sha256": "1hx5yal8jqnxr9c9ikvc6d0xp99kqjarj67720v9d4wvlmgsfabj", 37 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.14-hardened1/linux-hardened-5.14.14-hardened1.patch" 35 + "name": "linux-hardened-5.14.16-hardened1.patch", 36 + "sha256": "0k9n9k25bmzn3wsqkmjc27md7vc5qwg5a79zmwfw0adwlfwlgi5y", 37 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.16-hardened1/linux-hardened-5.14.16-hardened1.patch" 38 38 }, 39 - "sha256": "0snh17ah49wmfmazy6x42rhvl484h657y0iq4l09a885sjb4xzsd", 40 - "version": "5.14.14" 39 + "sha256": "005wis2y5dhksb6n0r4p3xjldppmdnd360dhxa04rfc4z2qwn3f3", 40 + "version": "5.14.16" 41 41 }, 42 42 "5.4": { 43 43 "patch": { 44 44 "extra": "-hardened1", 45 - "name": "linux-hardened-5.4.155-hardened1.patch", 46 - "sha256": "0l8h9i6asiypgbxl90370kzfsyyc3f4vwl2r191arvrsgw863bid", 47 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.155-hardened1/linux-hardened-5.4.155-hardened1.patch" 45 + "name": "linux-hardened-5.4.157-hardened1.patch", 46 + "sha256": "0651l6qambsdy7p1jry2ylf806gr66v6zrfz8lk0dndlhsgbb3dq", 47 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.157-hardened1/linux-hardened-5.4.157-hardened1.patch" 48 48 }, 49 - "sha256": "0f2hfz76rnhmv99zhbh7n1z48316ilxrxrnh4b5m3lj84y80y36c", 50 - "version": "5.4.155" 49 + "sha256": "0jl62j22vs59bc90mvzavv0ii9hvk436pbnrpqf3x9f8nfybngwz", 50 + "version": "5.4.157" 51 51 } 52 52 }
+2 -2
pkgs/os-specific/linux/kernel/linux-4.14.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.14.253"; 6 + version = "4.14.254"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "1mgl55c8fa2ry4qp0phkdkzjhwfnkbhvi266n348kyjyqnjl234f"; 16 + sha256 = "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.19.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "4.19.214"; 6 + version = "4.19.215"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 16 - sha256 = "0i08np4gxiks7chp6j328pdqb02apbba53mj4zvxb9v37qpxzqgz"; 16 + sha256 = "1czjqa5wbsmzgl7wwqlp9qbdig45ibq11m9pcykrjaclrgwn884y"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.4.nix
··· 1 1 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: 2 2 3 3 buildLinux (args // rec { 4 - version = "4.4.290"; 4 + version = "4.4.291"; 5 5 extraMeta.branch = "4.4"; 6 6 extraMeta.broken = stdenv.isAarch64; 7 7 8 8 src = fetchurl { 9 9 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 10 - sha256 = "1dcx58nmzkcc5nz2b5b7mgw4w7y28v3s9wd8h78czdqfa0kxrl20"; 10 + sha256 = "0lbbvv3ha4d8nwzjh8bdk0aqyd12w6gw0nsxsdnp8pbmnndgb9vh"; 11 11 }; 12 12 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-4.9.nix
··· 1 1 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: 2 2 3 3 buildLinux (args // rec { 4 - version = "4.9.288"; 4 + version = "4.9.289"; 5 5 extraMeta.branch = "4.9"; 6 6 extraMeta.broken = stdenv.isAarch64; 7 7 8 8 src = fetchurl { 9 9 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; 10 - sha256 = "0v5592v565bl924c23m1n7p5zddr0w7zn8m97pmikk6p7cyhjq9n"; 10 + sha256 = "19kz74qgw5yzfinnsvljmn2zm855lr4cxgfpn8gwljmkspyx1hm5"; 11 11 }; 12 12 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.10.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.10.76"; 6 + version = "5.10.77"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "140qkvs88b5zh6mxxzpf36z1r8bbvyh3yigripqjz1k236x0j2j8"; 16 + sha256 = "1hwgbcfv9wfx9ka25lsqjrnzskynfgmswcyp5vk14wnxq7glxdnk"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.14.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.14.15"; 6 + version = "5.14.16"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "01m4qw1z7xn3ngsbm1bvcvikqpkjjr9n8585556wkmz9d469mwvl"; 16 + sha256 = "005wis2y5dhksb6n0r4p3xjldppmdnd360dhxa04rfc4z2qwn3f3"; 17 17 }; 18 18 } // (args.argsOverride or { }))
+2 -2
pkgs/os-specific/linux/kernel/linux-5.4.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "5.4.156"; 6 + version = "5.4.157"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; 16 - sha256 = "1zkpqfhrc5n0yiij3jzvzywgabva53c8668f1ly1pkrzcbj77zh6"; 16 + sha256 = "0jl62j22vs59bc90mvzavv0ii9hvk436pbnrpqf3x9f8nfybngwz"; 17 17 }; 18 18 } // (args.argsOverride or {}))
+2 -2
pkgs/os-specific/linux/kernel/linux-libre.nix
··· 1 1 { stdenv, lib, fetchsvn, linux 2 2 , scripts ? fetchsvn { 3 3 url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; 4 - rev = "18413"; 5 - sha256 = "1s0nr3pnczr1ijv86307mfhmkk7xn5ah46wx6jrx857agcd73fzq"; 4 + rev = "18452"; 5 + sha256 = "0l9xnblid2nv6afp4d8g6kwlhwbw72cnqfaf2lix65bqc1ivdpl9"; 6 6 } 7 7 , ... 8 8 }:
+4 -4
pkgs/servers/http/nginx/mainline.nix
··· 1 - { callPackage, ... }@args: 1 + { callPackage, openssl_3_0, ... }@args: 2 2 3 - callPackage ./generic.nix args { 4 - version = "1.21.3"; 5 - sha256 = "0nhps7igdqcpcy1r8677ar807rfclpylmz3y858a678m1np4lxql"; 3 + callPackage ./generic.nix (args // { openssl = openssl_3_0; }) { 4 + version = "1.21.4"; 5 + sha256 = "1ziv3xargxhxycd5hp6r3r5mww54nvvydiywcpsamg3i9r3jzxyi"; 6 6 }
+4 -4
pkgs/servers/prowlarr/default.nix
··· 16 16 }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); 17 17 18 18 hash = { 19 - x64-linux_hash = "sha256-9DoqyotXAUha2TMSgDIot5PD8ABpfZ8gsshS1ypr5SY="; 20 - arm64-linux_hash = "sha256-r22c70OuevRsF8gOHZOkkhlRtoD4nsTHnXF82elQIF8="; 21 - x64-osx_hash = "sha256-6jVM4iSGT7tpagocI/1nuBPVvAegfFqsCfrz2fPKCI4="; 19 + x64-linux_hash = "sha256-wrBfgwzb+HI6cu9EyC70xZ5WsfkW+o+Q69jeCjoZRtI="; 20 + arm64-linux_hash = "sha256-wnuLqd1T/21QyqjHbpK2w+WRyW1rd4pHqcRLFrIKHW8="; 21 + x64-osx_hash = "sha256-gu+eByulCs9zLe3AXfVfcOXB49q6V7MWQ2DN2O/enfk="; 22 22 }."${arch}-${os}_hash"; 23 23 24 24 in stdenv.mkDerivation rec { 25 25 pname = "prowlarr"; 26 - version = "0.1.1.978"; 26 + version = "0.1.1.1030"; 27 27 28 28 src = fetchurl { 29 29 url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz";
+9
pkgs/tools/networking/connman/connman.nix
··· 1 1 { lib, stdenv 2 2 , fetchurl 3 + , fetchpatch 3 4 , pkg-config 4 5 , file 5 6 , glib ··· 60 61 url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; 61 62 sha256 = "sha256-GleufOI0qjoXRKrDvlwhIdmNzpmUQO+KucxO39XtyxI="; 62 63 }; 64 + 65 + patches = lib.optionals stdenv.hostPlatform.isMusl [ 66 + # Fix Musl build by avoiding a Glibc-only API. 67 + (fetchpatch { 68 + url = "https://git.alpinelinux.org/aports/plain/community/connman/libresolv.patch?id=e393ea84386878cbde3cccadd36a30396e357d1e"; 69 + sha256 = "1kg2nml7pdxc82h5hgsa3npvzdxy4d2jpz2f93pa97if868i8d43"; 70 + }) 71 + ]; 63 72 64 73 buildInputs = [ 65 74 glib
+2 -2
pkgs/tools/security/exploitdb/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "exploitdb"; 5 - version = "2021-11-04"; 5 + version = "2021-11-05"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "offensive-security"; 9 9 repo = pname; 10 10 rev = version; 11 - sha256 = "sha256-4qNQcmBq0q+FDRGtunUfngO+1jAK+fUBUHsq8E2rAy0="; 11 + sha256 = "sha256-G+toeAMnP26Wzs5gPeT+YKJ8uiy/mgFwBGxDY9w0qyM="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ makeWrapper ];
+17 -2
pkgs/top-level/all-packages.nix
··· 10243 10243 10244 10244 v2ray = callPackage ../tools/networking/v2ray { }; 10245 10245 10246 + v2ray-domain-list-community = callPackage ../data/misc/v2ray-domain-list-community { }; 10247 + 10246 10248 vacuum = callPackage ../applications/networking/instant-messengers/vacuum {}; 10247 10249 10248 10250 vampire = callPackage ../applications/science/logic/vampire {}; ··· 12785 12787 cargo-make = callPackage ../development/tools/rust/cargo-make { 12786 12788 inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 12787 12789 }; 12788 - cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; 12790 + cargo-modules = callPackage ../development/tools/rust/cargo-modules { 12791 + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices; 12792 + }; 12789 12793 cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { 12790 12794 inherit (darwin.apple_sdk.frameworks) Security; 12791 12795 }; ··· 18840 18844 18841 18845 inherit (callPackages ../development/libraries/openssl { }) 18842 18846 openssl_1_0_2 18843 - openssl_1_1; 18847 + openssl_1_1 18848 + openssl_3_0; 18844 18849 18845 18850 openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { }; 18846 18851 ··· 24130 24135 24131 24136 clapper = callPackage ../applications/video/clapper { }; 24132 24137 24138 + ciscoPacketTracer7 = callPackage ../applications/networking/cisco-packet-tracer/7.nix { }; 24139 + 24140 + ciscoPacketTracer8 = callPackage ../applications/networking/cisco-packet-tracer/8.nix { }; 24141 + 24133 24142 claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { 24134 24143 inherit (xorg) libSM; 24135 24144 useGtk3 = false; ··· 27020 27029 jdk = jdk11; 27021 27030 }; 27022 27031 27032 + netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; 27033 + 27023 27034 ncdu = callPackage ../tools/misc/ncdu { }; 27024 27035 27025 27036 ncdc = callPackage ../applications/networking/p2p/ncdc { }; ··· 27971 27982 super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; 27972 27983 27973 27984 super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging; 27985 + 27986 + snapmaker-luban = callPackage ../applications/misc/snapmaker-luban { }; 27974 27987 27975 27988 robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; 27976 27989 ··· 29068 29081 inherit (xorg) xcompmgr; 29069 29082 29070 29083 picom = callPackage ../applications/window-managers/picom {}; 29084 + 29085 + picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; 29071 29086 29072 29087 xd = callPackage ../applications/networking/p2p/xd {}; 29073 29088
+16 -1
pkgs/top-level/perl-packages.nix
··· 5804 5804 }; 5805 5805 }; 5806 5806 5807 + DateTimeFormatRFC3339 = buildPerlPackage rec { 5808 + pname = "DateTime-Format-RFC3339"; 5809 + version = "1.2.0"; 5810 + src = fetchurl { 5811 + url = "mirror://cpan/authors/id/I/IK/IKEGAMI/DateTime-Format-RFC3339-v${version}.tar.gz"; 5812 + sha256 = "1xqdbbiksy6kapc3mv3ayjahmxxlzmb5x7rad4by1iii9hif2vhk"; 5813 + }; 5814 + propagatedBuildInputs = [ DateTime ]; 5815 + meta = { 5816 + description = "Parse and format RFC3339 datetime strings"; 5817 + license = lib.licenses.cc0; 5818 + }; 5819 + }; 5820 + 5807 5821 DateTimeSet = buildPerlModule { 5808 5822 pname = "DateTime-Set"; 5809 5823 version = "0.3900"; ··· 24700 24714 sha256 = "068nhmld1031grgi4qm7k5niwxlbn6qd08zf6g1gj4c7qfas62q1"; 24701 24715 }; 24702 24716 SKIP_SAX_INSTALL = 1; 24703 - buildInputs = [ AlienBuild AlienLibxml2 ]; 24717 + buildInputs = [ AlienBuild AlienLibxml2 ] 24718 + ++ lib.optional stdenv.isDarwin pkgs.libiconv; 24704 24719 propagatedBuildInputs = [ XMLSAX ]; 24705 24720 }; 24706 24721