Merge staging-next into staging
This commit is contained in:
commit
b5e9debb55
32 changed files with 243 additions and 188 deletions
|
@ -13868,6 +13868,15 @@
|
|||
githubId = 245573;
|
||||
name = "Dmitry Kalinkin";
|
||||
};
|
||||
victormignot = {
|
||||
email = "victor.mignot@protonmail.com";
|
||||
github = "victormignot";
|
||||
githubId = 58660971;
|
||||
name = "Victor Mignot";
|
||||
keys = [{
|
||||
fingerprint = "CA5D F91A D672 683A 1F65 BBC9 0317 096D 20E0 067B";
|
||||
}];
|
||||
};
|
||||
vidbina = {
|
||||
email = "vid@bina.me";
|
||||
github = "vidbina";
|
||||
|
|
|
@ -7,17 +7,18 @@
|
|||
, substituteAll
|
||||
, xorg
|
||||
, wrapGAppsHook
|
||||
, gitUpdater
|
||||
}:
|
||||
|
||||
perlPackages.buildPerlPackage rec {
|
||||
pname = "fbmenugen";
|
||||
version = "0.86";
|
||||
version = "0.87";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trizen";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0ya7s8b5xbaplz365bnr580szxxsngrs2n7smj8vz8a7kwi0319q";
|
||||
sha256 = "A0yhoK/cPp3JlNZacgLaDhaU838PpFna7luQKNDvyOg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -65,6 +66,8 @@ perlPackages.buildPerlPackage rec {
|
|||
wrapProgram "$out/bin/${pname}" --prefix PERL5LIB : "$PERL5LIB"
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { inherit pname version; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/trizen/fbmenugen";
|
||||
description = "Simple menu generator for the Fluxbox Window Manager";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kratos";
|
||||
version = "0.9.0-alpha.3";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ory";
|
||||
repo = "kratos";
|
||||
rev = "v${version}";
|
||||
sha256 = "1x6g5mbbz1nkqi814dcyvdn8dyizpilzsb9cqijw0kpw4y3px757";
|
||||
hash = "sha256-Ld2N7w9jQLkzCww1Sex5nEBZf6e9XIUnbfPOjcFAYQA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1v29g302zqh7sc5s53dyz1mki0iijnr6nfj4fajayz2n7bfw3kh1";
|
||||
vendorSha256 = "sha256-9zXoJ+c1aPWDqasechC4ModWE0+sfMqZzp/Pph/mYcs=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logseq";
|
||||
version = "0.8.4";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
|
||||
sha256 = "sha256-zzMowQnSyrxL/qCSAOB1tffizOmOpbnN6UePETAqIlM=";
|
||||
sha256 = "sha256-1nvkjucMRAwpqg2LI+1UrICMLzSd6t0yGnYdCUNQslU=";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
};
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "terranix";
|
||||
version = "2.5.4";
|
||||
version = "2.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrVanDalo";
|
||||
repo = "terranix";
|
||||
rev = version;
|
||||
sha256 = "sha256-zctvB0zpPY2C1HkMyEK6NFNuPVNGcU9b8gv9HafBd2A=";
|
||||
sha256 = "sha256-5s9YFvbYMp8x0uoXM/jOCPPdjau6+4zeK/rGRkXBdx0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
18
pkgs/applications/science/electronics/systemc/default.nix
Normal file
18
pkgs/applications/science/electronics/systemc/default.nix
Normal file
|
@ -0,0 +1,18 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "systemc";
|
||||
version = "2.3.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.accellera.org/images/downloads/standards/systemc/${pname}-${version}.tar.gz";
|
||||
sha256 = "5781b9a351e5afedabc37d145e5f7edec08f3fd5de00ffeb8fa1f3086b1f7b3f";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The language for System-level design, modeling and verification";
|
||||
homepage = "https://systemc.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ victormignot ];
|
||||
};
|
||||
}
|
|
@ -18,13 +18,13 @@
|
|||
# want it to match the upstream format because sage depends on it.
|
||||
, texinfo4
|
||||
, texlive
|
||||
, enableDocs ? true
|
||||
, enableDocs ? !stdenv.isDarwin
|
||||
, enableGfanlib ? true
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "singular";
|
||||
version = "4.3.1";
|
||||
version = "4.3.1p2";
|
||||
|
||||
# since the tarball does not contain tests, we fetch from GitHub.
|
||||
src = fetchFromGitHub {
|
||||
|
@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# if a release is tagged (which sometimes does not happen), it will
|
||||
# be in the format below.
|
||||
rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
|
||||
sha256 = "sha256-3r3epwaVbyveyYtmfxuevO4Q52J6FbI6RRqiaHQGJIk=";
|
||||
# rev = "Release-${lib.replaceStrings ["."] ["-"] version}";
|
||||
rev = "370a87f29e7b2a3fefe287184bd4f75b793cb03c";
|
||||
sha256 = "sha256-T2tJ5yHTLzrXdozQB/XGZn4lNhpwVd9L30ZOzKAHxWs=";
|
||||
|
||||
# the repository's .gitattributes file contains the lines "/Tst/
|
||||
# export-ignore" and "/doc/ export-ignore" so some directories are
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=../../../../. -i bash -p curl jq nix gnused
|
||||
# shellcheck shell=bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
|
@ -67,6 +68,18 @@ generate_package_list() {
|
|||
done
|
||||
}
|
||||
|
||||
version_older () {
|
||||
cur_version=$1
|
||||
max_version=$2
|
||||
result=$(nix-instantiate -I ../../../../. \
|
||||
--eval -E "(import <nixpkgs> {}).lib.versionOlder \"$cur_version\" \"$max_version\"")
|
||||
if [[ "$result" == "true" ]]; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
aspnetcore_packages () {
|
||||
local version=$1
|
||||
# These packages are implicitly references by the build process,
|
||||
|
@ -92,14 +105,11 @@ aspnetcore_packages () {
|
|||
# This should not happend in minor or bugfix updates, but probably happens
|
||||
# with every new major .NET release.
|
||||
local pkgs=( \
|
||||
"Microsoft.AspNetCore.App.Ref" \
|
||||
"Microsoft.AspNetCore.App.Runtime.linux-arm" \
|
||||
"Microsoft.AspNetCore.App.Runtime.linux-arm64" \
|
||||
"Microsoft.AspNetCore.App.Runtime.linux-musl-arm" \
|
||||
"Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" \
|
||||
"Microsoft.AspNetCore.App.Runtime.linux-musl-x64" \
|
||||
"Microsoft.AspNetCore.App.Runtime.linux-x64" \
|
||||
"Microsoft.AspNetCore.App.Runtime.osx-arm64" \
|
||||
"Microsoft.AspNetCore.App.Runtime.osx-x64" \
|
||||
"Microsoft.AspNetCore.App.Runtime.win-arm" \
|
||||
"Microsoft.AspNetCore.App.Runtime.win-arm64" \
|
||||
|
@ -107,6 +117,16 @@ aspnetcore_packages () {
|
|||
"Microsoft.AspNetCore.App.Runtime.win-x86" \
|
||||
)
|
||||
|
||||
# Packages that only apply to .NET 6 and up
|
||||
if ! version_older "$version" "6"; then
|
||||
pkgs+=( \
|
||||
"Microsoft.AspNetCore.App.Ref" \
|
||||
"Microsoft.AspNetCore.App.Runtime.linux-musl-arm" \
|
||||
"Microsoft.AspNetCore.App.Runtime.osx-arm64" \
|
||||
)
|
||||
fi
|
||||
|
||||
|
||||
generate_package_list "$version" "${pkgs[@]}"
|
||||
}
|
||||
|
||||
|
@ -135,35 +155,21 @@ sdk_packages () {
|
|||
# This should not happend in minor or bugfix updates, but probably happens
|
||||
# with every new major .NET release.
|
||||
local pkgs=( \
|
||||
"Microsoft.NETCore.App.Composite" \
|
||||
"Microsoft.NETCore.App.Host.linux-arm" \
|
||||
"Microsoft.NETCore.App.Host.linux-arm64" \
|
||||
"Microsoft.NETCore.App.Host.linux-musl-arm" \
|
||||
"Microsoft.NETCore.App.Host.linux-musl-arm64" \
|
||||
"Microsoft.NETCore.App.Host.linux-musl-x64" \
|
||||
"Microsoft.NETCore.App.Host.linux-x64" \
|
||||
"Microsoft.NETCore.App.Host.osx-arm64" \
|
||||
"Microsoft.NETCore.App.Host.osx-x64" \
|
||||
"Microsoft.NETCore.App.Host.win-arm" \
|
||||
"Microsoft.NETCore.App.Host.win-arm64" \
|
||||
"Microsoft.NETCore.App.Host.win-x64" \
|
||||
"Microsoft.NETCore.App.Host.win-x86" \
|
||||
"Microsoft.NETCore.App.Ref" \
|
||||
"Microsoft.NETCore.App.Runtime.linux-arm" \
|
||||
"Microsoft.NETCore.App.Runtime.linux-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.linux-musl-arm" \
|
||||
"Microsoft.NETCore.App.Runtime.linux-musl-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.linux-musl-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.linux-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-arm" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.win-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.win-x86" \
|
||||
"Microsoft.NETCore.App.Runtime.osx-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.osx-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.win-arm" \
|
||||
"Microsoft.NETCore.App.Runtime.win-arm64" \
|
||||
|
@ -185,10 +191,6 @@ sdk_packages () {
|
|||
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
"runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \
|
||||
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" \
|
||||
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
|
@ -197,10 +199,6 @@ sdk_packages () {
|
|||
"runtime.linux-x64.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
"runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \
|
||||
"runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" \
|
||||
"runtime.osx-x64.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
|
@ -223,8 +221,36 @@ sdk_packages () {
|
|||
"runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" \
|
||||
)
|
||||
|
||||
# Packages that only apply to .NET 6 and up
|
||||
if ! version_older "$version" "6"; then
|
||||
pkgs+=( \
|
||||
"Microsoft.NETCore.App.Composite" \
|
||||
"Microsoft.NETCore.App.Host.linux-musl-arm" \
|
||||
"Microsoft.NETCore.App.Host.osx-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.linux-musl-arm" \
|
||||
"Microsoft.NETCore.App.Runtime.osx-arm64" \
|
||||
"Microsoft.NETCore.App.Ref" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-arm" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.linux-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-arm64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.osx-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.win-x64" \
|
||||
"Microsoft.NETCore.App.Runtime.Mono.win-x86" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
"runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \
|
||||
"runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \
|
||||
)
|
||||
fi
|
||||
|
||||
# Packages that only apply to .NET 7 and up
|
||||
if [[ ! ( "$version" =~ ^[1-6]\. ) ]]; then
|
||||
if ! version_older "$version" "7"; then
|
||||
# ILCompiler requires nixpkgs#181373 to be fixed to work properly
|
||||
pkgs+=( \
|
||||
"runtime.linux-arm64.Microsoft.DotNet.ILCompiler" \
|
||||
|
|
|
@ -4,61 +4,134 @@
|
|||
{
|
||||
aspnetcore_3_1 = buildAspNetCore {
|
||||
inherit icu;
|
||||
version = "3.1.26";
|
||||
version = "3.1.28";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/6f72adf7-0e78-48ea-85ef-e72a39a1f8a1/1ec0238c236c3757e5628563a329fdc4/aspnetcore-runtime-3.1.26-linux-x64.tar.gz";
|
||||
sha512 = "8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/effaa5bf-0fa7-4e5a-9ce8-9ac04ee86669/5afb2b1c2ad68550cec914d8fb303d20/aspnetcore-runtime-3.1.28-linux-x64.tar.gz";
|
||||
sha512 = "fd66f9c0d0e9ed57abe5f81650c2ff49c694e05927e5280dbbdee1a9eb4299f0710bdc06ae0af0737c0a0584970b24d3eb952434b45ad8984fe3e37ca95cc1b1";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/6b68a14a-b4dd-4a75-bb32-26c08d19190f/1d6b637e290775f668701f8f6092ab35/aspnetcore-runtime-3.1.26-linux-arm64.tar.gz";
|
||||
sha512 = "757ff6cbc31b1c8743077288d7fa621c73fa7f4d155d636ad100cda6e1f601e31d2f842d5cfef3dec5daa4c8c3efbcf76f02afd1c518cae7b67b2a46a9faab08";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/75b4f8b5-8aeb-4ba1-956d-bfc17ba5d6b3/bb3744801157ebc769808a92eabeee5c/aspnetcore-runtime-3.1.28-linux-arm64.tar.gz";
|
||||
sha512 = "28371a6888d41e938f14cceb6c8a4471a1f0d7b585045e65b914f23ffb894f72a66a4a4cdaaf6d21dfd60063bb35d88c36fce8d4411a89c89b52023807639f82";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/33e8be5c-5e6a-4dc2-9aa8-846aaffa6897/fe9d96af1d75f8d5f4cba4bff95f2fae/aspnetcore-runtime-3.1.26-osx-x64.tar.gz";
|
||||
sha512 = "0657d8b11a58357f5374e5d8201b401e55f9f4710794be565f7b9022d10639c2e72aebc6b7433b34fd24a03e8e12541c998fad28b5263de4439b3d31a8252c4c";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/a9ad2468-f18b-4d35-9b9d-f2bccc681bdc/b3100ca07ee0e8dc4ef958921d4adbfa/aspnetcore-runtime-3.1.28-osx-x64.tar.gz";
|
||||
sha512 = "965b23a32a9734c72515430e05d395db506a3a802997a6268ed42e24a700f06e5971cd38102f4ceb9c9d85d8515c1b0d11d4e5fbf8adc00c14060cb503a8faf1";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
runtime_3_1 = buildNetRuntime {
|
||||
inherit icu;
|
||||
version = "3.1.26";
|
||||
version = "3.1.28";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/a14c8e4d-a22b-47f8-953c-bb4337634513/58017d103d432f7106c44b0891936aba/dotnet-runtime-3.1.26-linux-x64.tar.gz";
|
||||
sha512 = "03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/9a0b8ff8-d3da-4e77-9b5b-2fb3202afbbe/94dbcaacd4ebf59106a141c8e9e84167/dotnet-runtime-3.1.28-linux-x64.tar.gz";
|
||||
sha512 = "b0760d463b8935a14bc247899b692038ded7d476a0cf2ed262eaac8ee6840350b29738cd1ab4961ba93b05f1802e7aba6e3c5e27e06ec9cb5e244149c52adea4";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/cb0e8b4b-7b2b-40cc-b7a6-30f0d4fabe6c/f5cb06cbb1b1b5d198792333b3db235a/dotnet-runtime-3.1.26-linux-arm64.tar.gz";
|
||||
sha512 = "574409616f5cbef35a2bd6fd1a2f0bcb3bdaa81457aea3af5e0e237ba768ced5214c51a3045697fe7478e8211e2045fc2072e382d6f456509a8f2923e9b1fc26";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/d71449b4-4504-410b-a805-48b3a6af5182/06abb8b35645e76dbe8cc4d17fdcbf89/dotnet-runtime-3.1.28-linux-arm64.tar.gz";
|
||||
sha512 = "feb65d2926e21df802c600c8c8c060d15cf44458150b2be8a5d9dc42735cb89d1a5e990121f7ba5813d6f8acf88b6e6bae11d078156c84023e1337b917219b17";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/6bedea65-b104-45b8-abe9-36cefbeedadf/05f4e472ec2395dad7103fda9ed278b2/dotnet-runtime-3.1.26-osx-x64.tar.gz";
|
||||
sha512 = "7957b5e697db7548964c399197ae8e61cc31f15374df384b6db9b47472a7d6f1b5b3e256c191e203c4d18c18cc8bdb6c4a331c5875bd37bd6415f3c83b8062da";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/ff22de78-4644-4395-a187-3910c27222d6/95c5a5334aa3c861238518a66696efa2/dotnet-runtime-3.1.28-osx-x64.tar.gz";
|
||||
sha512 = "ad6ad23b08460eb09b5019760083906df96d064a5f0a34aa9b31b4e1eb4c8313ee59c1f3717056e3e9f4db8310329f9aed368bea6bba3c0a86c4a4ec7083bbb9";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
sdk_3_1 = buildNetSdk {
|
||||
inherit icu;
|
||||
version = "3.1.420";
|
||||
version = "3.1.422";
|
||||
srcs = {
|
||||
x86_64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/5424da8c-ce12-46de-a51a-8fa61aefdde6/52a9d6b5718ea40863db96901c780d4b/dotnet-sdk-3.1.420-linux-x64.tar.gz";
|
||||
sha512 = "b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/4fd83694-c9ad-487f-bf26-ef80f3cbfd9e/6ca93b498019311e6f7732717c350811/dotnet-sdk-3.1.422-linux-x64.tar.gz";
|
||||
sha512 = "690759982b12cce7a06ed22b9311ec3b375b8de8600bd647c0257c866d2f9c99d7c9add4a506f4c6c37ef01db85c0f7862d9ae3de0d11e9bec60958bd1b3b72c";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/a84bf296-ee6e-4e66-9694-90d3da7af2b4/b00b2efe2432938e5a19c45d3759d80f/dotnet-sdk-3.1.420-linux-arm64.tar.gz";
|
||||
sha512 = "ac66b1544fe178153bb85c2e5be584464374ce4c036fc95720547c231c2730312018fbdfc735f9071579749415bc54e1f6b8f080cc2b08d5799a0da941e8a5f5";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/fdf76122-e9d5-4f66-b96f-4dd0c64e5bea/d756ca70357442de960db145f9b4234d/dotnet-sdk-3.1.422-linux-arm64.tar.gz";
|
||||
sha512 = "3eb7e066568dfc0135f2b3229d0259db90e1920bb413f7e175c9583570146ad593b50ac39c77fb67dd3f460b4621137f277c3b66c44206767b1d28e27bf47deb";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/bb0efe58-450c-4e28-81c1-4081acd6ffa4/1d0eaf8b624dff000c8b10ea0497e731/dotnet-sdk-3.1.420-osx-x64.tar.gz";
|
||||
sha512 = "370cba4685e07d1cdb5d7f9b754812b237802ace679c9b9985c6e5c4dc09f500580f1413679a288615079bd155b68b362adb00151b2b8f5ca7c3718ab9e16194";
|
||||
url = "https://download.visualstudio.microsoft.com/download/pr/515fcb39-1e67-4cf5-908e-0e00f3cd76b2/6478e6b98726db240cb6b572f9eab97e/dotnet-sdk-3.1.422-osx-x64.tar.gz";
|
||||
sha512 = "9f919e42a692e048405b52cce8938fd4c40e7dcdf9c6c29eaa41940af7846cd2a678b5c43222d1cb988236917e47d85f37212bfe0c2dc6973cd5a8f2799838ff";
|
||||
};
|
||||
};
|
||||
packages = { fetchNuGet }: [
|
||||
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "3.1.28"; sha256 = "0ssf6qdsaihg86pb39162xi5sfnv6b2na85brk6h3gcw2ydqfgbc"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "3.1.28"; sha256 = "0gri8zsq5qk5czfg2ik9fc0a3nscz2jn7g1knsp717qxix31ilaf"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "3.1.28"; sha256 = "0wp5nrb63k9p5850bfqjscf0hjyqi5dcw8vsymnfnjdd06zldp6j"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "3.1.28"; sha256 = "16p8z8n47w7m89wy34wh7zyg8a21hbsv8vswrw3b6gh3r861jg24"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.1.28"; sha256 = "1cvgplsmg6d9bgxr7lnnnh7lhcmwhn3r08cnw4di9x92xaysgzwg"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "3.1.28"; sha256 = "1zv3vjifjcd56q8xp47998d4016a8ma8x0a2pdlki2kghwjjpmcv"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "3.1.28"; sha256 = "0myfvrwn13z8l6j294jw9qrdzg4ld9dp683jdmy657q30vxqj9ci"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "3.1.28"; sha256 = "1dhg0p820mg2v0gh9yd4snh062cbz0mg106idrii8mhkn09na698"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "3.1.28"; sha256 = "04ss3gd6frf7p9ipry427a0cw9jh4l1xapq3sc0p33hd9g3ggkp3"; })
|
||||
(fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "3.1.28"; sha256 = "07r9gd9gc4b0h7fdswk3c4bf617fkcy5jw9y2y8rm97c1gfxph3p"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "3.1.28"; sha256 = "186i94wddk4j93pqmwzr6fdrf8vqhlipansjfpp530l8d3zba7zp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.28"; sha256 = "0asdcnqf2vr9v159brdhg0wmfbvh8gl9n14ynv0h561dkdlps7fr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "3.1.28"; sha256 = "0y5m5azblkr2vi8qba83mnad7irmywn7i1b154yig9r09245plgp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "3.1.28"; sha256 = "0bm99w4v4mw9nj400szvywripgv8vk96vyxmpr0vq96fpzkx66wr"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.28"; sha256 = "09974p9xl37x3dgclpvv280kiclnlvlwg31id8bkrz7ir8iafwbx"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "3.1.28"; sha256 = "10rrf9gj81viisb31mc0nq90wr9fbnljzi0vn7bpylj68072sqi2"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "3.1.28"; sha256 = "00wcigwd6pphmcb19pj6krj4p8ydzzclgvjxqj45fdj8ja94d0dq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "3.1.28"; sha256 = "1rpj5mscc0b15dr6fphrb6lbkycd58d95n6r4vm40124c17nrp70"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "3.1.28"; sha256 = "15fp5g6334ri43vk4cas50b1fg31y0l7inba1z7fwbcrlf7kj72k"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "3.1.28"; sha256 = "1ac9538bx4l4skk295q6d3hm3yfrf3b57zavhlpy8wpclg97wqmc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "3.1.28"; sha256 = "0g2wdkm9dcs3d106r80q84i5plwhgnv34abpda8id993dprjpkg1"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "3.1.28"; sha256 = "175195fbgrzxs4zmgnx9xy3mlzdvbd8mrlya2is2s0pa0dz3aw61"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "3.1.28"; sha256 = "03n58cibw0dk782yrxargnbcrhwv43pvyiic71hvf2kh6hi282gp"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "3.1.28"; sha256 = "1xs1x03xmmxpy686wydb2v9b3vwb57lhjdxm4spsh74n0iwgbznq"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "3.1.28"; sha256 = "0pn000bgrb0lmqy34np3q974n3x4cv6rz1rc0w5n7kfnrlpwl15l"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "3.1.28"; sha256 = "0hgj4pib1ckl38hd197g9x22dvb2h0302zny6za6156sblizypr4"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "3.1.28"; sha256 = "0irh5riigrpq0wfqsbphf3r1a4w29p547pnml8h5997mmch5ds13"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "3.1.28"; sha256 = "0fayr4rp3ykn0rp3jir81x9ilvg3hfj8s86raxv19k54x15grqw7"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "3.1.28"; sha256 = "1j4hf84ycjhna8ng8hxl3bmwwbnzcfbsj751widwhlbnsy7vdiy4"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "3.1.28"; sha256 = "0mb5kr8rqgh4m01n20xdw8ji87ixxan9qkbjjr7amiv38x1aimfa"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "16jm0pcjhmc83f5c5hk2n40xc73jg9358yw1mwm35jp5z15n9nah"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "184qcjc3h70q1w3mjjbmw7w7fq4j6daw5hk53zgbpicfd928i5fm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "1vx08xz65mapyjs6ixnn31c95i9b35h8fry4djdz167794zj2w0z"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "18jnw2cp3vpm9zkfbjv51gpl5786hsf5fdm6y89c5m25pckilvgi"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "0k4qv1srcsyq9c0d0xik5bjrng6sxsl6c1n9f8q0vyar63d4dm6y"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "1knlnq8xn3z87h2pwp12rcfiwzv7rf9h9245dhsaq0kv0h2173w5"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "11m6hvf56iq7q736mx21yrk14qnbyz4ahm8517pz9amiilwnwdcg"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "1hp6cysrhm0fn18bmiicy0plvpcplrjbxn792ps6iipn82hfxlfa"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "1b6rlnazbm9h3rwdz2qglqbn44qxbzny8x0cnj5aqa9wxg0ipkqw"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "1klfr2a842xflc48mw2zds4cb8s95p1m2yb3w0h58rnpkry4r8cw"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "01v74s41kyysy8v4q20zbl1ba9n6sc55mizybvgjl869h437bikf"; })
|
||||
(fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "039an5v5yck70pl4y3h3nphf6jga6vl071iiakv5siccvkpg2zcr"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "03fmzxhhxdvs36zjp38h39g1x4zzabfhfac5k5a80m23kh8zk199"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "0k7ngxhn39ybx3z64bds7kzwmnpyfzpyx6gyv8l0zw9gzaiakmzx"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "0254fw61xcmvlah2c5fpl4ifslph9vqavba8b7i2b8hjj1ah569x"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "0219z3dqiygl8j8q3khxdvkvpzb4lpk5r76an47lnxpqkw90ip4k"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "0ndcp8b1is2h9rjrkn9hs468n9z619qpbqcnj11algpj0gcs00qn"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "1fz9r6n018rzqarabfkqdbzm0d6nnprkx1cpyplxl6kmc60gp9f7"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "19lavwarm8svf725vilh1zzwlx27khy27n7nw9d1cvi40r3vpvfp"; })
|
||||
(fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "0b6wa3a479d4w1zxgk748q70nkcrzs3c2snlxhhciz4bv09mrbd3"; })
|
||||
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "1pj7i6kdf8k31d9bczkggn6fdjrjigzsrvmh24zfz2n3q48g0grc"; })
|
||||
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "0llnj78c9ds5y2cg2f1q1mz1kbmzm9vs35hq942d4lfv1hpxbd4n"; })
|
||||
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "1nlxmpzb7qgznx0wmm6zci26y7wvkwndq34d4jm310g8qzrqkxn8"; })
|
||||
(fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "0lbsyn96a3nfy94x9n6k9aka5v7q34hbbjdjd0w0is7njrly1xg4"; })
|
||||
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "0qyf2n35bn0wp4iy4f2whfm1syl44k42g3md2dbivppdc16qs828"; })
|
||||
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "091iff9mpp837vakyy5h7mqh1m90gz9x76ch5n49znq7qf819jz4"; })
|
||||
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "0byn4ng5cs54r1gz84wz9g914n0dby643fs4iyx14v5pg9ns7m7y"; })
|
||||
(fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "0jh7kmgxjf4xpsbxyf86yfq4ff0lxrhcykhc9mqizmgsp3kdzg36"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "1x7xkjvx2j7khr6iafl1dvzsfqswr54y79lf17w8m196lbsvn13j"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "18nqdrm8d2xdf7cq7hcbh5v2fa28kdyx682bb0wb4w06x4gziy55"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "06gfp66ax9m2jhd07alcn0dp8hyxkyi934wy8asl64y1c08rhh09"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "01q1vs13ifnbqywpmdli83w7bdhph88njz15dhmx7kxjadcicclc"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "1kd6np0i0wfz5kpq2528by8sxmp2q7fdsncks9s7sk9s2am6q6wr"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "1r9j70gykblfqd2cxnnhb0hpj0pidn9kk7c7v20bmnkv0vn8nb27"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "0aqinv4s9n61i66dd499x1adiw64a83iscddjaxml4qzyffp3v2g"; })
|
||||
(fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "13n0lshgwpwizz7zqm6cph621bk2ayhkkimfmp60wz0s9mhx78f3"; })
|
||||
(fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "0ky15gpji8hs8hnibk3ckcqk1fpk20kgsgkvczpvq88qd0nzlp1d"; })
|
||||
(fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "03n3ps5y45hgniirr9bb80cvrwsddb9ixj8xzlxzdg349j3cz5mw"; })
|
||||
(fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "0a91gv56gl6j97gn7p0ss0ivpnl7gxhb90sklgbvvwp3601gka6a"; })
|
||||
(fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "02i5cphwkqg5z5ariy2lrn8fbx15nbq3pzzw2ncja933zqg145zs"; })
|
||||
(fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "3.1.28"; sha256 = "01xcvlrif0wqq02p1x74sqvm95b9aqm5ada1q2l2xr9yglrzh0lq"; })
|
||||
(fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "3.1.28"; sha256 = "0j9b8xy9vq7vlgx4fbcrh1g2qypai2q5iar6fwsialrrgp3v599x"; })
|
||||
(fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "3.1.28"; sha256 = "1pl66sqxiw103bknbwcazf82sr2q6x1fk21h0d5xl7cgpabx53gs"; })
|
||||
(fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "3.1.28"; sha256 = "1jbg3gpmqrbnhy7rf7xjg84riyzfmlmzl8ixpy2ks59q0mm22vkw"; })
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -15,15 +15,6 @@ gccStdenv.mkDerivation {
|
|||
|
||||
buildInputs = [ autoconf ];
|
||||
|
||||
# disable stackprotector on aarch64-darwin for now
|
||||
# build error:
|
||||
# ```
|
||||
# /private/tmp/nix-build-gambit-bootstrap-4.9.3.drv-0/ccbOVwnF.s:207:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x2, [x2, ___stack_chk_guard];momd
|
||||
# ^
|
||||
# ```
|
||||
hardeningDisable = lib.optionals (gccStdenv.isAarch64 && gccStdenv.isDarwin) [ "stackprotector" ];
|
||||
|
||||
configurePhase = ''
|
||||
export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \
|
||||
CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \
|
||||
|
|
|
@ -35,15 +35,6 @@ gccStdenv.mkDerivation rec {
|
|||
# Or wrap relevant programs to add a suitable PATH ?
|
||||
#runtimeDeps = [ gnused gnugrep ];
|
||||
|
||||
# disable stackprotector on aarch64-darwin for now
|
||||
# build error:
|
||||
# ```
|
||||
# /private/tmp/nix-build-gambit-unstable-2020-09-20.drv-0/ccIjyeeb.s:207:15: error: index must be an integer in range [-256, 255].
|
||||
# ldr x2, [x2, ___stack_chk_guard];momd
|
||||
# ^
|
||||
# ```
|
||||
hardeningDisable = lib.optionals (gccStdenv.isAarch64 && gccStdenv.isDarwin) [ "stackprotector" ];
|
||||
|
||||
configureFlags = [
|
||||
"--enable-targets=${gambit-params.targets}"
|
||||
"--enable-single-host"
|
||||
|
|
|
@ -2,29 +2,16 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "julia-bin";
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz";
|
||||
sha256 = "0ff7ypr76xf99h3dmy1xdnkq2xn432qnzihxs72xrd4j5nhlybwv";
|
||||
sha256 = "sha256-6A1zLMt/eeAA15jLi2Vtw2QatZUW1uTlLhZ2UBeJKgA=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
# Julia’s source files are in different locations for source and binary
|
||||
# releases. Thus we temporarily create a symlink to allow us to share patches
|
||||
# with source releases.
|
||||
prePatch = ''
|
||||
ln -s share/julia/test
|
||||
'';
|
||||
patches = [
|
||||
# Source release Nix patch(es) relevant for binary releases as well.
|
||||
./patches/1.7-bin/0005-nix-Enable-parallel-unit-tests-for-sandbox.patch
|
||||
];
|
||||
postPatch = ''
|
||||
# Revert symlink hack.
|
||||
rm test
|
||||
|
||||
# Julia fails to pick up our Certification Authority root certificates, but
|
||||
# it provides its own so we can simply disable the test. Patching in the
|
||||
# dynamic path to ours require us to rebuild the Julia system image.
|
||||
|
@ -46,6 +33,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doInstallCheck = true;
|
||||
preInstallCheck = ''
|
||||
export JULIA_TEST_USE_MULTIPLE_WORKERS=true
|
||||
# Some tests require read/write access to $HOME.
|
||||
export HOME="$TMPDIR"
|
||||
'';
|
|
@ -1,30 +0,0 @@
|
|||
From 44c2c979c4f2222567ce65f506cf47fb87482348 Mon Sep 17 00:00:00 2001
|
||||
From: Pontus Stenetorp <pontus@stenetorp.se>
|
||||
Date: Thu, 8 Apr 2021 04:37:44 +0000
|
||||
Subject: [PATCH 5/6] nix: Enable parallel unit tests for sandbox
|
||||
|
||||
Disabled by default due to lack of networking in the Nix sandbox. This
|
||||
greatly speeds up the build process on a multi-core system.
|
||||
---
|
||||
test/runtests.jl | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/runtests.jl b/test/runtests.jl
|
||||
index 2f9cd058bb..2f8c19fa32 100644
|
||||
--- a/test/runtests.jl
|
||||
+++ b/test/runtests.jl
|
||||
@@ -83,8 +83,9 @@ prepend!(tests, linalg_tests)
|
||||
import LinearAlgebra
|
||||
cd(@__DIR__) do
|
||||
n = 1
|
||||
- if net_on
|
||||
- n = min(Sys.CPU_THREADS, length(tests))
|
||||
+ if net_on || haskey(ENV, "NIX_BUILD_CORES")
|
||||
+ x = haskey(ENV, "NIX_BUILD_CORES") ? parse(Int, ENV["NIX_BUILD_CORES"]) : Sys.CPU_THREADS
|
||||
+ n = min(x, Sys.CPU_THREADS, length(tests))
|
||||
n > 1 && addprocs_with_testenv(n)
|
||||
LinearAlgebra.BLAS.set_num_threads(1)
|
||||
end
|
||||
--
|
||||
2.29.3
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
diff --git a/data/meson.build b/data/meson.build
|
||||
index c189753..12c10cb 100644
|
||||
index a1fc61f..7c03882 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -7,7 +7,7 @@ if get_option('enable-backend')
|
||||
|
@ -43,7 +43,7 @@ index 1427fbe..2623f16 100644
|
|||
desktop_file.full_path(),
|
||||
autostart_dir)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index fde6fa3..39b7b0a 100644
|
||||
index 8aa5c31..b011879 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -12,7 +12,11 @@ gclue_api_version='2.0'
|
||||
|
@ -69,10 +69,10 @@ index fde6fa3..39b7b0a 100644
|
|||
conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source'))
|
||||
conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source'))
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 83bc60e..b726329 100644
|
||||
index 5b8c42d..945dfd5 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -34,6 +34,9 @@ option('systemd-system-unit-dir',
|
||||
@@ -40,6 +40,9 @@ option('systemd-system-unit-dir',
|
||||
option('dbus-srv-user',
|
||||
type: 'string', value: 'root',
|
||||
description: 'The user (existing) as which the service will run')
|
||||
|
|
|
@ -27,38 +27,19 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geoclue";
|
||||
version = "2.5.7";
|
||||
version = "2.6.0";
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
owner = "geoclue";
|
||||
repo = "geoclue";
|
||||
rev = version;
|
||||
sha256 = "1mv1vs4q94bqkmgkj53jcsw1x31kczwydyy3r27a7fycgzmii1pj";
|
||||
hash = "sha256-TbuO9wpyjtvyvqaCryaTOunR0hVVlJuqENWQQpcMcz4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for falling back to GeoIP when WiFi devices are not found
|
||||
# https://gitlab.freedesktop.org/geoclue/geoclue/-/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494
|
||||
# NOTE: this should be removed when the next version is released
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/2de651b6590087a2df2defe8f3d85b3cf6b91494.patch";
|
||||
sha256 = "hv7t2Hmpv2oDXiPWA7JpYD9q+cuuk+En/lJJickvFII=";
|
||||
})
|
||||
|
||||
# Make the Mozilla API key configurable
|
||||
# https://gitlab.freedesktop.org/geoclue/geoclue/merge_requests/54 (only partially backported)
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/95c9ad4dc176860c85a07d0db4cb4179929bdb54.patch";
|
||||
sha256 = "/lq/dLBJl2vf16tt7emYoTtXY6iUw+4s2XcABUHp3Kc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/geoclue/geoclue/commit/1a00809a0d89b0849a57647c878d192354247a33.patch";
|
||||
sha256 = "6FuiukgFWg2cEKt8LlKP4E0rfSH/ZQgk6Ip1mGJpNFQ=";
|
||||
})
|
||||
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
];
|
||||
|
||||
|
@ -122,6 +103,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
license = licenses.lgpl2;
|
||||
license = licenses.lgpl2Plus;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libatomic_ops";
|
||||
version = "7.6.12";
|
||||
version = "7.6.14";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz"
|
||||
"https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-8KtWbiX84ItWDh/qtqPbAdtKOOW8aHgEM07zkgxUnz4=";
|
||||
sha256 = "sha256-OQ8kTUJHFHNbcFDQVlZ2FbO48pAIpmPCYvtUjxgC0pI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, matplotlib
|
||||
{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, lxml, matplotlib
|
||||
, nibabel, numpy, pandas, scikit-learn, scipy, joblib, requests }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
@ -17,6 +17,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
joblib
|
||||
lxml
|
||||
matplotlib
|
||||
nibabel
|
||||
numpy
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pick";
|
||||
version = "1.4.0";
|
||||
version = "2.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "wong2";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-y4wlYYDyhwnRjz9ItiDi2iCa/0F2RTB6Rstl8lmQ/3w=";
|
||||
sha256 = "sha256-fuhQFytJCVmNlMiqhuM6xD+BjmLMX3quPAyJNHE/cdY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tflint";
|
||||
version = "0.39.3";
|
||||
version = "0.40.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "terraform-linters";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AjNWVo81oYvlrfKERJhIXsv/WPpusuqVd1nvvsAgbbE=";
|
||||
sha256 = "sha256-cJGzE+J3JLwH2NWl81kL7AfuYox2kKQvTFdAPUMneFY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6sk1bFuSCrKt9uMrrwOpX/SBZrjFvtqVPFylbRNHpz4=";
|
||||
vendorSha256 = "sha256-+2A/yB7yO8p2Q3ZhMv5TqpkBAu7KHq8PefXsIDM/XUg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.28.1";
|
||||
version = "0.29.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6K4aOp5mjX+qhG/OS/Gs1kAOpDGUPdgRNx4zp3i/c2A=";
|
||||
sha256 = "sha256-oPBk5mTCq8nn4olC9Z7ROvrfAUXDxnWhm8w20sh5Wkw=";
|
||||
};
|
||||
vendorSha256 = "sha256-YouAdTo7huco35er84MRfI1gmq11VbFwRGSovs1XDYo=";
|
||||
vendorSha256 = "sha256-5Pb1mr3rYPcWFLjETAZp8rLW32n+RyCm7NbfooM4hZs=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
|
||||
|
||||
|
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-expand";
|
||||
version = "1.0.30";
|
||||
version = "1.0.31";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dtolnay";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-H97B48SrcUTgY7hLMx9NUc4VUENBZtGMwpI6ijTUB08=";
|
||||
sha256 = "sha256-zyh5Tcs0RbZebiLfl9bIH5Ua5cizJPDlNuoVQhW3I/c=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OCCBmcKNotsDXAAu0A8HCmniDLofkp2MmBm+k3C0ZJ4=";
|
||||
cargoSha256 = "sha256-WMIgBtZowpXElTradzgGjN/TQxDn9RzS7hBKfFAlFEM=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
|
|
@ -4,13 +4,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sumneko-lua-language-server";
|
||||
version = "3.5.4";
|
||||
version = "3.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sumneko";
|
||||
repo = "lua-language-server";
|
||||
rev = version;
|
||||
sha256 = "sha256-Tj+9UQoVzsiEq0JF7BjT41Mks+8dAV2Op/zceRmWU/k=";
|
||||
sha256 = "sha256-TSBV10QBD9TiQMsH800bSDbOzkD1orzHT4gLNWVE3Iw=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bootstrap";
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
|
||||
sha256 = "sha256-CLykGjXxTZCXIJAyF6YBeEeC3oCz3g5Kcm0kLdOQUks=";
|
||||
sha256 = "sha256-f/HG5qVgKb8zYd+Pv5IkkYqGcMy+BlEileRC5xiv4WM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "apache-jena";
|
||||
version = "4.5.0";
|
||||
version = "4.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz";
|
||||
sha256 = "sha256-/KHjhMNnqac2HG/yvHJa0MwdReX6XuexojaMgRFdaWo=";
|
||||
sha256 = "sha256-1fNl6O9FVLzBx4U+4E72GY60UGMSRFdKNxIrPdcb/aA=";
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nncp";
|
||||
version = "8.7.2";
|
||||
version = "8.8.0";
|
||||
outputs = [ "out" "doc" "info" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.nncpgo.org/download/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-oO7JsPMwWd4z8TCEWZgF0PShyMN56SW6z+jclNHdwj0=";
|
||||
sha256 = "829E2FB2F1EED8AF7ACE4554405E56F0341BE2A01C234A34D01122382AA0794C";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ go redo-apenwarr ];
|
||||
|
|
|
@ -8,16 +8,16 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "pomerium-cli";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pomerium";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P1aEAr+Q2wnKLq3JHQbss6SPdrYnzE8J2yp/Lu5Cg/0=";
|
||||
sha256 = "sha256-tmMACV9iISbK+5JTiUOTsepjrtX5s4PrBvMDGJgEix0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AAdhFpFCbUU3kjVQ84sYWYrGBWD5u6f219MvVS0j9Oo=";
|
||||
vendorSha256 = "sha256-gS7EtRckbqVafTft/N9KYjASx4W4vAbs6cPiwNHHZZ0=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/pomerium-cli"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spire";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
outputs = [ "out" "agent" "server" ];
|
||||
|
||||
|
@ -10,7 +10,7 @@ buildGoModule rec {
|
|||
owner = "spiffe";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wyKluqYKNmaJaXK70v7/f2WEGgekd0Qgdu3UZnXm/UU=";
|
||||
sha256 = "sha256-YUsam6dIm5jDjUQ8U9puG3jvrNWCS0epaOvwo4hjixc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EZWoMSBxdvnrdBmSrRYf4+2d1LCka7oUIhRAW+2n7CU=";
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "sshuttle";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IfuRvfOStQ5422uNdelbc6ydr9Nh4mV+eE5nRWEhkxU=";
|
||||
sha256 = "sha256-9aPtHlqxITx6bfhgr0HxqQOrLK+/73Hzcazc/yHmnuY=";
|
||||
};
|
||||
|
||||
patches = [ ./sudo.patch ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "vault-medusa";
|
||||
version = "0.3.5";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jonasvinther";
|
||||
repo = "medusa";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W5OkLOtRH1l/h3liV7ANyS3jqu0IGM5ZnZGAk/Yaz6I=";
|
||||
sha256 = "sha256-KAKHuUv6nFVi3ucXkXGs9yfy2WFBnIDaDiNLKXsEOlI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-mlZHA5XGtOg4yd1iepWvxPWx0VaIY3XotlW6CEm7i1k=";
|
||||
vendorSha256 = "sha256-DCq+Dke33trkntrXz49I1mDxsJodVbtZEbg1UF6Tmwk=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A cli tool for importing and exporting Hashicorp Vault secrets";
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ buildPackages, fetchurl, lib, stdenv, libgcrypt, readline, libgpg-error }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.9";
|
||||
version = "1.6.10";
|
||||
pname = "freeipmi";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-8l4cNfPQ8bWpnMMezCNTyoPtRqFRY4QvuocBJ9ycggY=";
|
||||
sha256 = "sha256-/OSh5AG2GJwQPSsSAyYdC/v0WYXG8/pExRsYaxP+en0=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
|
|
@ -651,6 +651,7 @@ mapAliases ({
|
|||
julia_11 = throw "julia_11 has been deprecated in favor of the latest stable version"; # Added 2020-09-15
|
||||
julia_13 = throw "julia_13 has been deprecated in favor of the latest stable version"; # Added 2021-03-13
|
||||
julia_10-bin = throw "julia_10-bin has been deprecated in favor of the latest LTS version"; # Added 2021-12-02
|
||||
julia_17-bin = throw "julia_17-bin has been deprecated in favor of the latest stable version"; # Added 2022-09-04
|
||||
|
||||
json_glib = throw "'json_glib' has been renamed to/replaced by 'json-glib'"; # Converted to throw 2022-02-22
|
||||
jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # Added 2021-10-15
|
||||
|
|
|
@ -11340,6 +11340,8 @@ with pkgs;
|
|||
|
||||
sysbench = callPackage ../development/tools/misc/sysbench {};
|
||||
|
||||
systemc = callPackage ../applications/science/electronics/systemc { };
|
||||
|
||||
system-config-printer = callPackage ../tools/misc/system-config-printer {
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
libxml2 = libxml2Python;
|
||||
|
@ -14043,10 +14045,10 @@ with pkgs;
|
|||
julia = julia-stable;
|
||||
|
||||
julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
|
||||
julia_17-bin = callPackage ../development/compilers/julia/1.7-bin.nix { };
|
||||
julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { };
|
||||
|
||||
julia-lts-bin = julia_16-bin;
|
||||
julia-stable-bin = julia_17-bin;
|
||||
julia-stable-bin = julia_18-bin;
|
||||
julia-bin = julia-stable-bin;
|
||||
|
||||
jwasm = callPackage ../development/compilers/jwasm { };
|
||||
|
|
Loading…
Reference in a new issue