diff options
60 files changed, 9272 insertions, 925 deletions
diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 15b8d3839b19..6f9717ca09cc 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -13,6 +13,7 @@ with import <nixpkgs> {}; let androidComposition = androidenv.composeAndroidPackages { + cmdLineToolsVersion = "8.0"; toolsVersion = "26.1.1"; platformToolsVersion = "30.0.5"; buildToolsVersions = [ "30.0.3" ]; @@ -42,7 +43,10 @@ exceptions are the tools, platform-tools and build-tools sub packages. The following parameters are supported: -* `toolsVersion`, specifies the version of the tools package to use +* `cmdLineToolsVersion `, specifies the version of the `cmdline-tools` package to use +* `toolsVersion`, specifies the version of the `tools` package. Notice `tools` is + obsolete, and currently only `26.1.1` is available, so there's not a lot of + options here, however, you can set it as `null` if you don't want it. * `platformsToolsVersion` specifies the version of the `platform-tools` plugin * `buildToolsVersions` specifies the versions of the `build-tools` plugins to use. diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 5d6f204ee839..c720c8068c87 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -952,6 +952,7 @@ let ''; } else { name = "RenameInterface"; + nodes = { }; testScript = ""; }; # even with disabled networkd, systemd.network.links should work diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 913ef7570eee..c04e215b9908 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -62,7 +62,7 @@ let rm -rf bin/gdb/linux ln -s ${gdb} bin/gdb/linux - ls -d $PWD/bin/lldb/linux/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 5d54b1150bcc..b6d4e39f9fc5 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -3,26 +3,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "e542111e490fbbc80d3aebcbbc343b29e17bf6766d7b708675618d8e49b6ee83", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.tar.gz", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.tar.gz", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "7bfe02c1b414c2fc095deab35fa40ed29a129bfa76efc3e31a2785f0f37fa778", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "987f6dca9518da262f556ba1a5afe6190cc5c13a6692c194b4f9ee05d4e66318", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.tar.gz", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -35,18 +35,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "4c3514642ce6c86e5343cc29b01c06ddc9c55f134bcb6650de5d7d36205799e8", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "02bc35281eb4e1285eeb9d797ec2b31ec7370e320ad0e89f6f1fa704d78ec4bf", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "ce807ba3a776e14f85dbd38f2744fc97e54318561eddd1c265f0d2cacc2565da", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "6fa3aff1c730bb79bf3e2e29edcce6d4cdbccfa631524c6253de518be6b6f3d2", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -68,26 +68,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "b243103f27cfb763106a2f5667d8f201562154755ce9746e81e88c80acd7b316", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0ae72d1931a6effbeb2329f6e5c35859d933798a494479f066ef0a7b2be6b553", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "8f845077cc0fa3582348ee3d76a69ff001391b3f3d63a9b279b8039fd6e07622", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "56430090dd471e106fdc48463027d89de624759f8757248ced9776978854e4f6", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "d785f02e355983c6762248860052a81f75b392e25b585ff5a913aeaa2a2a3010", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "ad853b75bc1e1379593bece3a5fbecec21d1de30263d0d5fef067a352b7d27ef", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -110,26 +110,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.3.1", - "sha256": "e6246c929e0d0b9340b66dd282572d67db7bf6031d5789f197be8817de54b186", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "482461646f61f355c7fd976e655bf77dadfa545483c6ab47352ff22eb1193e33", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.3.2", - "sha256": "3c91269f04bd6f6df0ae8f2042c029097f56c2ccbc45db95b4f66e87e9d4a320", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "e9da8036c7d268368b3f82034389481730cb663b809659b1fa1ab91fd9bdc8cd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3.1", - "sha256": "4b86b523b02f2df5150bc965bcef7e1a0bf7a7e6d2233a3a2603529a8577dd43", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "26ff68ea27952c1adc651ad5f2fae7ad4ca7b744f70f582bdf1bd4c1d17132f4", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -142,18 +142,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.3.1", - "sha256": "8ea8b1ceebde397950592708b55f277ca43856b4013f597ccbf385bb75a42c72", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "14b3f587e868adfb132791e17e3b1978a2fb5fd55447eae589c4d95d70c9ace7", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.3.1", - "sha256": "5278cf5ded9464b284fa568f2b453eb5b207a0c75e26354bfb66ef8e96be85e6", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "54d51ba7b65f84545faa7f8fc001b2bce48ef3ddb76006a44de9e95c6b395b8c", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -175,26 +175,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.3.1", - "sha256": "adfb73d85ffb30c2abf715a6c6a0a2ed64a047a3016021a2cb61838457c66a81", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0a5a396b71533ab7ec77b2f10e08a20a970ac5712cfeb3378728020ec84be416", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.3.1", - "sha256": "2e3bff74a53df74ceee0ac182ffc2f22248317ced0a33f8c0014b1ed504d9650", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "6537fe033c13fb9b06da7583c875b0dc5f20660e5b349edc39bd8fdddffaf0f3", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.3.1", - "sha256": "9d73b21e558db89ac24a406187cb96e506e320ca0154e8db6aeac7ff960c8944", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "896dadb76b44bacef79b31619719107f8cf0e729331bda2d6b9f80e8be6dea92", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -217,26 +217,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "85ee94f4dac126ee2b87ab225f9be6fa828a0c17e067b896f541fd25599411ef", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0d3d8ccce520a26781a2d126b887d5a829e97987b728104203528510ff9a4423", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2-aarch64.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "13c8503f190e82b00949b26312873976a10c64dcca036ecc6ce9547b69341658", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2-aarch64.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "ef76c7d61c64f7f0f831ef2774bd908e68d651a20648fc4e63618e24a81be6dd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3-aarch64.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "555ca346ec41de06223d3a4b5e9247809e07c8339bff0d139b624634c812c8e5", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "776ff0a5f0293cd4b4c29380199757b359e6e195a57b69d2cef73f9cc44ee456", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56-aarch64.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -249,18 +249,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "394478e3f2a2ea1788a5c2ef9c5a9db72531462b4db921483d24a08f7c260a43", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "808fa52e8dceacb8beb6b84705ac44ded04b67d07c1310449d7cd5c7afbdea46", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "1e9454c2500e1ec0d490e19d175a30f4441ffd30200a5a1041ecbeff3c66c7e4", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "ea6da172fc8f27b7bad5475f0e1fc3359c492885bba8b6de59be727cb7b65284", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -282,26 +282,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "6574cfd20a586fcbdfbac2ea0fa903ea078c1702fd9e5145c33c7c8dc4506388", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "5a0fcb9fdc94896cd5651d9d60fa708596aebe374bc35944b3ff6133f4eb5aae", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "640e4088d976820808d4571c8060b473ab6cfde34699d5913ec3c528ca70faac", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "3237e19f920880a92712d7a61df5eadd6b8e1652cf97115078289468e17332a4", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "d25ba49504c22e8669b8e15033cb6e944e9948ecbb0394ba4bbd5804f1f6657f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1-aarch64.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "a680b91d6c909f913317c91b1912b1b822c121d14d78962f7f44f7473e54b5a2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2-aarch64.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 0dfed1116433..a1f830f0e53d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2580,8 +2580,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.14.0"; - sha256 = "sha256-DvcQ0wNmWqmMen7jYVP0tCDz/wdzBb56An+OaD3d4xA="; + version = "2.15.0"; + sha256 = "sha256-YfcO/01nO+92xZEJgYyLYAkqXMqfV/QDkcN9Dnjp5ZA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; diff --git a/pkgs/applications/graphics/vkdt/default.nix b/pkgs/applications/graphics/vkdt/default.nix index 757bf7cb7b53..38b4bdee2a13 100644 --- a/pkgs/applications/graphics/vkdt/default.nix +++ b/pkgs/applications/graphics/vkdt/default.nix @@ -30,25 +30,31 @@ stdenv.mkDerivation rec { sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; }; - buildInputs = [ - vulkan-headers - vulkan-tools - vulkan-loader - glslang - glfw - libjpeg - pkg-config - rsync - cmake + strictDeps = true; + + nativeBuildInputs = [ clang + cmake + glslang |