From c84b60b2a93b44268d4cdb440457832b729641c9 Mon Sep 17 00:00:00 2001 From: Manuel Bärenz Date: Fri, 5 Feb 2021 10:27:26 +0100 Subject: agda.section.md: Lay out Agda maintenance guidelines --- doc/languages-frameworks/agda.section.md | 57 +++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) (limited to 'doc/languages-frameworks') diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 2b7c35f68d3..def9e1254e4 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -158,7 +158,23 @@ This can be overridden. By default, Agda sources are files ending on `.agda`, or literate Agda files ending on `.lagda`, `.lagda.tex`, `.lagda.org`, `.lagda.md`, `.lagda.rst`. The list of recognised Agda source extensions can be extended by setting the `extraExtensions` config variable. -## Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs} +## Maintaining the Agda package set on Nixpkgs {#maintaining-the-agda-package-set-on-nixpkgs} + +We are aiming at providing all common Agda libraries as packages on `nixpkgs`, +and keeping them up to date. +Contributions and maintenance help is always appreciated, +but the maintenance effort is typically low since the Agda ecosystem is quite small. + +The `nixpkgs` Agda package set tries to take up a role similar to that of [Stackage](https://www.stackage.org/) in the Haskell world. +It is a curated set of libraries that: + +1. Always work together. +2. Are as up-to-date as possible. + +While the Haskell ecosystem is huge, and Stackage is highly automatised, +the Agda package set is small and can (still) be maintained by hand. + +### Adding Agda packages to Nixpkgs {#adding-agda-packages-to-nixpkgs} To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: @@ -192,3 +208,42 @@ mkDerivation { This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`. When writing an Agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes Agda to think that the nix store is a Agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613). + +In the pull request adding this library, +you can test whether it builds correctly by writing in a comment: + +``` +@ofborg build agdaPackages.iowa-stdlib +``` + +### Maintaining Agda packages + +As mentioned before, the aim is to have a compatible, and up-to-date package set. +These two conditions sometimes exclude each other: +For example, if we update `agdaPackages.standard-library` because there was an upstream release, +this will typically break many reverse dependencies, +i.e. downstream Agda libraries that depend on the standard library. +In `nixpkgs` we are typically among the first to notice this, +since we have build tests in place to check this. + +In a pull request updating e.g. the standard library, you should write the following comment: + +``` +@ofborg build agdaPackages.standard-library.passthru.tests +``` + +This will build all reverse dependencies of the standard library, +for example `agdaPackages.agda-categories`, or `agdaPackages.generic`. + +Sometimes, the builds of the reverse dependencies fail because they have not yet been updated and released. +You should drop the maintainers a quick issue notifying them of the breakage, +citing the build error (which you can get from the ofborg logs). +If you are motivated, you might even send a pull request that fixes it. +Usually, the maintainers will answer within a week or two with a new release. +Bumping the version of that reverse dependency should be a further commit on your PR. + +In the rare case that a new release is not to be expected within an acceptable time, +simply mark the broken package as broken by setting `meta.broken = true;`. +This will exclude it from the build test. +It can be added later when it is fixed, +and does not hinder the advancement of the whole package set in the meantime. -- cgit 1.4.1 From 8c0be16075ff3508c54f14221be6df43561916fa Mon Sep 17 00:00:00 2001 From: Manuel Bärenz Date: Fri, 5 Feb 2021 14:24:54 +0100 Subject: adga: Add test for all packages --- doc/languages-frameworks/agda.section.md | 7 +++++++ pkgs/top-level/agda-packages.nix | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'doc/languages-frameworks') diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index def9e1254e4..775a7a1a642 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -235,6 +235,13 @@ In a pull request updating e.g. the standard library, you should write the follo This will build all reverse dependencies of the standard library, for example `agdaPackages.agda-categories`, or `agdaPackages.generic`. +In some cases it is useful to build _all_ Agda packages. +This can be done with the following Github comment: + +``` +@ofborg build agda.passthru.tests.allPackages +``` + Sometimes, the builds of the reverse dependencies fail because they have not yet been updated and released. You should drop the maintainers a quick issue notifying them of the breakage, citing the build error (which you can get from the ofborg logs). diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 7434134d28f..a70f7eb0b43 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -13,7 +13,10 @@ let lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; }); - agda = withPackages [] // { inherit withPackages; }; + agda = withPackages [] // { + inherit withPackages; + passthru.tests.allPackages = withPackages (lib.filter (pkg: self.lib.isUnbrokenAgdaPackage pkg) (lib.attrValues self)); + }; standard-library = callPackage ../development/libraries/agda/standard-library { inherit (pkgs.haskellPackages) ghcWithPackages; -- cgit 1.4.1 From eca667180beb2473ec85895a8679df7ffff9e7c8 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 26 Sep 2021 23:06:38 +0200 Subject: dotnet: cleanup; point dotnet-sdk alias to 5_0; remove unsupported SDKs --- doc/languages-frameworks/dotnet.section.md | 7 +- .../blockchains/wasabiwallet/default.nix | 5 +- pkgs/build-support/build-dotnet-module/default.nix | 2 +- pkgs/development/compilers/dotnet/build-dotnet.nix | 10 +-- .../compilers/dotnet/combine-packages.nix | 2 +- pkgs/development/compilers/dotnet/default.nix | 82 ++++------------------ .../tools/build-managers/msbuild/default.nix | 4 +- .../development/tools/omnisharp-roslyn/default.nix | 4 +- pkgs/games/osu-lazer/default.nix | 4 +- pkgs/servers/jellyfin/default.nix | 6 +- pkgs/servers/nosql/eventstore/default.nix | 4 +- pkgs/servers/prowlarr/default.nix | 2 +- pkgs/servers/radarr/default.nix | 2 +- pkgs/tools/X11/opentabletdriver/default.nix | 13 ++-- .../backup/discordchatexporter-cli/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 19 ++--- 17 files changed, 57 insertions(+), 112 deletions(-) (limited to 'doc/languages-frameworks') diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 738d7bad271..9bf96f3198a 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -28,8 +28,7 @@ mkShell { packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 - sdk_3_0 - sdk_2_1 + sdk_5_0 ]) ]; } @@ -64,9 +63,9 @@ $ dotnet --info The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project. -## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.net-vs-dotnetcorepackages.netcore-vs-dotnetcorepackages.aspnetcore} +## dotnetCorePackages.sdk vs dotnetCorePackages.runtime vs dotnetCorePackages.aspnetcore {#dotnetcorepackages.sdk-vs-dotnetcorepackages.runtime-vs-dotnetcorepackages.aspnetcore} -The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version. +The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `runtime` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. ## Packaging a Dotnet Application {#packaging-a-dotnet-application} diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 2fe128f1d29..0b90fc10bbc 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -2,7 +2,7 @@ , fetchurl , makeDesktopItem , curl -, dotnet-netcore +, dotnetCorePackages , fontconfig , krb5 , openssl @@ -11,9 +11,10 @@ }: let + dotnet-runtime = dotnetCorePackages.runtime_5_0; libPath = lib.makeLibraryPath [ curl - dotnet-netcore + dotnet-runtime fontconfig.lib krb5 openssl diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix index 0c1a1f686e7..0161c101e5b 100644 --- a/pkgs/build-support/build-dotnet-module/default.nix +++ b/pkgs/build-support/build-dotnet-module/default.nix @@ -32,7 +32,7 @@ # The dotnet SDK to use. , dotnet-sdk ? dotnetCorePackages.sdk_5_0 # The dotnet runtime to use. -, dotnet-runtime ? dotnetCorePackages.net_5_0 +, dotnet-runtime ? dotnetCorePackages.runtime_5_0 , ... } @ args: assert projectFile == null -> throw "Defining the `projectFile` attribute is required. This is usually an `.csproj`, or `.sln` file."; diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index 56880826a19..38c2fae6034 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -3,7 +3,7 @@ , sha512 }: -assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; +assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; { lib, stdenv , fetchurl , libunwind @@ -17,7 +17,7 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; let pname = if type == "aspnetcore" then "aspnetcore-runtime" - else if type == "netcore" then + else if type == "runtime" then "dotnet-runtime" else "dotnet-sdk"; @@ -30,12 +30,12 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); urls = { aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; - netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; + runtime = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-${platform}-${suffix}.tar.gz"; }; descriptions = { - aspnetcore = "ASP .NET Core runtime ${version}"; - netcore = ".NET Core runtime ${version}"; + aspnetcore = "ASP.NET Core Runtime ${version}"; + runtime = ".NET Runtime ${version}"; sdk = ".NET SDK ${version}"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index a38d44e37ef..c99af4e62ae 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -5,7 +5,7 @@ in assert lib.assertMsg ((builtins.length packages) != 0) ''You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ - sdk_3_0 aspnetcore_2_1 + sdk_3_1 aspnetcore_5_0 ];`'' ; buildEnv { name = "dotnet-core-combined"; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 89d7f4c7d92..5b4740c22e5 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,6 @@ /* How to combine packages for use in development: -dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_3_0 sdk aspnetcore_2_1 ]; +dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_5_0 aspnetcore_5_0 ]; Hashes below are retrived from: https://dotnet.microsoft.com/download/dotnet @@ -9,75 +9,19 @@ https://dotnet.microsoft.com/download/dotnet let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; }); - buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); in rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; - # v2.1.22 (LTS) + # EOL - aspnetcore_2_1 = buildAspNetCore { - version = "2.1.22"; - sha512 = { - x86_64-linux = "27v3a69dgnnb4lz5p2dn2qwadb8vpnqwdy6mnnqfp1dl4kgg3izvriz2268if272sy6flcz5lckjlmn0i0i1jci5zypc7x9kykj991l"; - aarch64-linux = null; # no aarch64 version of this package is available - x86_64-darwin = "0xh06jmzx2cfq51hv9l4h72hbfyh3r0wlla217821gi0hlw6xcc0gb3b4xmqcs240fllqnwrnrwz0axi3xi21wacgn3xbcmzpbi6jml"; - }; - }; - - netcore_2_1 = buildNetCore { - version = "2.1.22"; - sha512 = { - x86_64-linux = "0c2b31l59izcxbhz5wzjpjkdl550s5p3aid4vyghq468vyf67pm0npjny50c172b63vw0ikfbps2b2hj16hpifp116gj4b5llmqjhyc"; - aarch64-linux = "3llai3d2xpgbr7a4ndg9wqfpnb5zb8k07dicc57a6cmniiqyqigyxinhpx2k0l45mbnihjsr5k1rih3r6bwlj241v67iwd2i0dpqd8a"; - x86_64-darwin = "106mx6a4rwcvq41v54c1yx89156s43n889im9g0q2pvm7054q8b6xm6qrnymzmj5i2i6awyk0z02j5pfiyh35sw9afxb3695ymsb3v8"; - }; - }; - - sdk_2_1 = buildNetCoreSdk { - version = "2.1.810"; - sha512 = { - x86_64-linux = "388nrba5f7z9syq23xh3k45rzy3iys58s32ya7a0q9mwdf1y3haw7yvbq79cn08741hhqdi73mip8jf50f4s64mbr62ay1p76zsrkj5"; - aarch64-linux = "2vs8bhk63cjrqkm5n164ahc6bdz58aq9vmhaiyy27krp7wlkz4gpiva9153h7mywhk709l1qc7cddj99qsh2ygv6axjfigbhgrzslqi"; - x86_64-darwin = "3qxlgbd0np0w8wmp98mhp4cqgva4zglqf7k9kzqbwxfwr5s795kap7rs5w0cy7h0bsvj0ygx3d5nzyn9hp3fsswx4jl4mkvillnvjzy"; - }; - }; - - # v2.2 - - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1"; - - # v3.0.2 (Maintenance) - - aspnetcore_3_0 = buildAspNetCore { - version = "3.0.3"; - sha512 = { - x86_64-linux = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; - aarch64-linux = "2xkg4q88q5jw6jdz6cxj8vsjr475nd0fcvifkv1shdm2j9dsjy233hwpxbr140m5n5ggyh6z99238z9j4kp2az977y8y8irz8m8ppvf"; - x86_64-darwin = "2p04j6p4j93pan71ih13hv57zxalcirh0n3vfjq0cfb80pbhf1f5cgxl24pw6kifh6hhh38rj62c4mr69lxzlqc8sfcfaws8dyz2avm"; - }; - }; - - netcore_3_0 = buildNetCore { - version = "3.0.3"; - sha512 = { - x86_64-linux = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; - aarch64-linux = "1lp8din7d5jv5fkyq1a7m01i1xg9jwpiljvam1kcyzsnwzvi0cb4ji336cfx4lqrn95gvc75gkzi6q8b4fz0h21gvk6z6kmlcr63nyg"; - x86_64-darwin = "0s20k7xawwd09xhy4xdcxp1rw6jd418ibrvhb509dnj480g48xryda2203g4mpswd24v2kx0n9qzxgbrbq9lvasfglkxi84bbqayp83"; - }; - }; - - sdk_3_0 = buildNetCoreSdk { - version = "3.0.103"; - sha512 = { - x86_64-linux = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; - aarch64-linux = "32843q2lj7dgciq62g9v1q31vwfjyv5vaxrz712d942mcg5lyzjygwri106bv4naq3a22131ldzwnsifbdn2vq1iz60raqdb7ss9vnf"; - x86_64-darwin = "3apswk2bhalgi0hm7h2j9p152jvp39h4xilxxzix5j1n36b442l1pwk7lj7019lxafjqkz5y850xkfcp14ks5wcvs33xs2c0aqwxvcn"; - }; - }; + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS) or 5.0 (Current)"; - # v3.1.1 (LTS) + # v3.1 (LTS) aspnetcore_3_1 = buildAspNetCore { version = "3.1.19"; @@ -88,7 +32,7 @@ rec { }; }; - netcore_3_1 = buildNetCore { + runtime_3_1 = buildNetRuntime { version = "3.1.19"; sha512 = { x86_64-linux = "2cf268cc13bb4739203a18a9160aac58f2088e8ec275b1f7ef2fe2b74bc16edfdfbeb886a74fc9421edbf2899fa9e3ee7ea2734a83b1800b4a9848fb7e10bbbe"; @@ -97,7 +41,7 @@ rec { }; }; - sdk_3_1 = buildNetCoreSdk { + sdk_3_1 = buildNetSdk { version = "3.1.413"; sha512 = { x86_64-linux = "2a0824f11aba0b79d3f9a36af0395649bc9b4137e61b240a48dccb671df0a5b8c2086054f8e495430b7ed6c344bb3f27ac3dfda5967d863718a6dadeca951a83"; @@ -106,7 +50,7 @@ rec { }; }; - # v5.0.0 + # v5.0 (Current) aspnetcore_5_0 = buildAspNetCore { version = "5.0.10"; @@ -117,7 +61,7 @@ rec { }; }; - net_5_0 = buildNetCore { + runtime_5_0 = buildNetRuntime { version = "5.0.10"; sha512 = { x86_64-linux = "421b00d5751381e6bf829dcba8fa0d781f0efd065be492739d60a4bef2b7b362dbec77fa3289e2ee45cab40616f95318fc214699ffe2f33aa15e77c2d163841c"; @@ -126,7 +70,7 @@ rec { }; }; - sdk_5_0 = buildNetCoreSdk { + sdk_5_0 = buildNetSdk { version = "5.0.401"; sha512 = { x86_64-linux = "a444d44007709ceb68d8f72dec0531e17f85f800efc0007ace4fa66ba27f095066930e6c6defcd2f85cdedea2fec25e163f5da461c1c2b8563e5cd7cb47091e0"; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index b214f89eac9..5c3225c683f 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk, writeText, roslyn }: +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnetCorePackages, writeText, roslyn }: let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + xplat = fetchurl { url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; sha256 = "1wnzbdpk4s9bmawlh359ak2b8zi0sgx1qvcjnvfncr1wsck53v7q"; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index da15f47b6a2..25f7ce4e7aa 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -3,7 +3,7 @@ , fetchurl , mono6 , msbuild -, dotnet-sdk +, dotnetCorePackages , makeWrapper , unzip , writeText @@ -11,6 +11,8 @@ let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + deps = map (package: stdenv.mkDerivation (with package; { pname = name; inherit version src; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index c2714e84962..b07d8f08140 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -9,7 +9,7 @@ let ]; dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-net = dotnetCorePackages.net_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids runtimeId = "linux-x64"; @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { --output $out/lib/osu makeWrapper $out/lib/osu/osu\! $out/bin/osu\! \ - --set DOTNET_ROOT "${dotnet-net}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" for i in 16 32 48 64 96 128 256 512 1024; do install -D ./assets/lazer.png $out/share/icons/hicolor/''${i}x$i/apps/osu\!.png diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index c2c9df4b814..b9924c69e85 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -15,6 +15,8 @@ }: let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; runtimeDeps = [ ffmpeg fontconfig @@ -34,10 +36,6 @@ let "musl-"); # https://docs.microsoft.com/en-us/dotnet/core/rid-catalog#using-rids runtimeId = "${os}-${musl}${arch}"; - - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-net = dotnetCorePackages.net_5_0; - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; in stdenv.mkDerivation rec { pname = "jellyfin"; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 4a6db24bc4c..769c45ffc6c 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -2,13 +2,15 @@ , fetchFromGitHub , fetchurl , makeWrapper -, dotnet-sdk +, dotnetCorePackages , mono , Nuget }: let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + deps = import ./deps.nix { inherit fetchurl; }; in diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 511217a48f1..9cfc26925cc 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/{bin,share/${pname}-${version}} cp -r * $out/share/${pname}-${version}/. - makeWrapper "${dotnetCorePackages.netcore_3_1}/bin/dotnet" $out/bin/Prowlarr \ + makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Prowlarr \ --add-flags "$out/share/${pname}-${version}/Prowlarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo mono openssl icu ]} diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index dd2480de2e6..acb3ba82a4a 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/{bin,share/${pname}-${version}} cp -r * $out/share/${pname}-${version}/. - makeWrapper "${dotnetCorePackages.netcore_3_1}/bin/dotnet" $out/bin/Radarr \ + makeWrapper "${dotnetCorePackages.runtime_3_1}/bin/dotnet" $out/bin/Radarr \ --add-flags "$out/share/${pname}-${version}/Radarr.dll" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl sqlite libmediainfo mono openssl icu ]} diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 5bffa107764..b205f959ee3 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -3,8 +3,7 @@ , fetchFromGitHub , fetchurl , linkFarmFromDrvs -, dotnet-netcore -, dotnet-sdk +, dotnetCorePackages , dotnetPackages , dpkg , gtk3 @@ -21,6 +20,10 @@ , wrapGAppsHook }: +let + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; +in stdenv.mkDerivation rec { pname = "OpenTabletDriver"; version = "0.5.3.3"; @@ -114,19 +117,19 @@ stdenv.mkDerivation rec { makeWrapper $out/lib/OpenTabletDriver.Console $out/bin/otd \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" makeWrapper $out/lib/OpenTabletDriver.Daemon $out/bin/otd-daemon \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" makeWrapper $out/lib/OpenTabletDriver.UX.Gtk $out/bin/otd-gui \ "''${gappsWrapperArgs[@]}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --set DOTNET_ROOT "${dotnet-netcore}" \ + --set DOTNET_ROOT "${dotnet-runtime}" \ --suffix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDeps}" mkdir -p $out/lib/OpenTabletDriver diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 60437403e5a..38dfd55783d 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -18,7 +18,7 @@ buildDotnetModule rec { }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; - dotnet-runtime = dotnetCorePackages.netcore_3_1; + dotnet-runtime = dotnetCorePackages.runtime_3_1; nugetDeps = ./deps.nix; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9b962708a2a..a40257dcaa1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -204,6 +204,7 @@ mapAliases ({ dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 + dotnet-netcore = dotnet-runtime; # added 2021-10-07 double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5071d0567a3..e6fa5a73625 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -405,17 +405,13 @@ with pkgs; dotnetCorePackages = recurseIntoAttrs (callPackage ../development/compilers/dotnet {}); - dotnet-sdk = dotnetCorePackages.sdk_2_1; - dotnet-sdk_2 = dotnetCorePackages.sdk_2_1; - dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; - dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; - dotnet-netcore = dotnetCorePackages.netcore_2_1; - - dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1; + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-runtime = dotnetCorePackages.runtime_5_0; + dotnet-aspnetcore = dotnetCorePackages.aspnetcore_5_0; dumb-init = callPackage ../applications/virtualization/dumb-init {}; @@ -12389,7 +12385,7 @@ with pkgs; roslyn = callPackage ../development/compilers/roslyn { }; - msbuild = callPackage ../development/tools/build-managers/msbuild { dotnet-sdk = dotnet-sdk_5; }; + msbuild = callPackage ../development/tools/build-managers/msbuild { }; mosml = callPackage ../development/compilers/mosml { }; @@ -26890,10 +26886,7 @@ with pkgs; libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; })).callPackage ../applications/graphics/opentoonz { }; - opentabletdriver = callPackage ../tools/X11/opentabletdriver { - dotnet-sdk = dotnetCorePackages.sdk_5_0; - dotnet-netcore = dotnetCorePackages.net_5_0; - }; + opentabletdriver = callPackage ../tools/X11/opentabletdriver { }; opentx = libsForQt5.callPackage ../applications/misc/opentx { }; @@ -33161,7 +33154,7 @@ with pkgs; stdenv = crossLibcStdenv; }; - omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { dotnet-sdk = dotnet-sdk_5; }; + omnisharp-roslyn = callPackage ../development/tools/omnisharp-roslyn { }; wasmtime = callPackage ../development/interpreters/wasmtime {}; -- cgit 1.4.1 From c1a440b6cc781696ac23373f2b71e895cfc2c517 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Tue, 19 Oct 2021 05:37:05 +0000 Subject: doc: rust: target escape hatch has been removed As far as I can tell, a8efb2053fd9c1e2fea97699754b5071e94c1649 removed the `target =` escape hatch. See #112804 This commit removes it from the documentation. Signed-off-by: Arthur Gautier --- doc/languages-frameworks/rust.section.md | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'doc/languages-frameworks') diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index b2f045b11b3..26eb9e26bd0 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -237,22 +237,6 @@ where they are known to differ. But there are ways to customize the argument: --target /nix/store/asdfasdfsadf-thumb-crazy.json # contains {"foo":"","bar":""} ``` -Finally, as an ad-hoc escape hatch, a computed target (string or JSON file -path) can be passed directly to `buildRustPackage`: - -```nix -pkgs.rustPlatform.buildRustPackage { - /* ... */ - target = "x86_64-fortanix-unknown-sgx"; -} -``` - -This is useful to avoid rebuilding Rust tools, since they are actually target -agnostic and don't need to be rebuilt. But in the future, we should always -build the Rust tools and standard library crates separately so there is no -reason not to take the `stdenv.hostPlatform.rustc`-modifying approach, and the -ad-hoc escape hatch to `buildRustPackage` can be removed. - Note that currently custom targets aren't compiled with `std`, so `cargo test` will fail. This can be ignored by adding `doCheck = false;` to your derivation. -- cgit 1.4.1