diff --git a/pkgs/development/compilers/mono/4.6.nix b/pkgs/development/compilers/mono/4.6.nix deleted file mode 100644 index 5ccdadc28787..000000000000 --- a/pkgs/development/compilers/mono/4.6.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic.nix (rec { - inherit Foundation libobjc; - version = "4.6.2.16"; - sha256 = "190f7kcrm1y5x61s1xwdmjnwc3czsg50s3mml4xmix7byh3x2rc9"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65617511 - meta.knownVulnerabilities = [ "CVE-2018-1002208" ]; -}) diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.nix similarity index 100% rename from pkgs/development/compilers/mono/4.8.nix rename to pkgs/development/compilers/mono/4.nix diff --git a/pkgs/development/compilers/mono/5.0.nix b/pkgs/development/compilers/mono/5.0.nix deleted file mode 100644 index 53820c97b1b0..000000000000 --- a/pkgs/development/compilers/mono/5.0.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic-cmake.nix (rec { - inherit Foundation libobjc; - version = "5.0.1.1"; - sha256 = "064pgsmanpybpbhpam9jv9n8aicx6mlyb7a91yzh3kcksmqsxmj8"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 -}) diff --git a/pkgs/development/compilers/mono/5.4.nix b/pkgs/development/compilers/mono/5.4.nix deleted file mode 100644 index acebb4beef6a..000000000000 --- a/pkgs/development/compilers/mono/5.4.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic-cmake.nix (rec { - inherit Foundation libobjc; - version = "5.4.1.6"; - sha256 = "1pv5lmyxjr8z9s17jx19850k43ylzqlbzsgr5jxj1knmkbza1zdx"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65820147 -}) diff --git a/pkgs/development/compilers/mono/5.8.nix b/pkgs/development/compilers/mono/5.8.nix deleted file mode 100644 index 7b5008fd04c2..000000000000 --- a/pkgs/development/compilers/mono/5.8.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic-cmake.nix (rec { - inherit Foundation libobjc; - version = "5.8.0.108"; - sha256 = "177khb06dfll0pcncr84vvibni7f8m5fgb30ndgsdjk25xfcbmzc"; - enableParallelBuilding = false; -}) diff --git a/pkgs/development/compilers/mono/5.14.nix b/pkgs/development/compilers/mono/5.nix similarity index 100% rename from pkgs/development/compilers/mono/5.14.nix rename to pkgs/development/compilers/mono/5.nix diff --git a/pkgs/development/libraries/dbus-sharp/default.nix b/pkgs/development/libraries/dbus-sharp/default.nix index 2704ef2de9fd..14db5baea3fb 100644 --- a/pkgs/development/libraries/dbus-sharp/default.nix +++ b/pkgs/development/libraries/dbus-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, pkgconfig, mono48, autoreconfHook }: +{stdenv, fetchFromGitHub, pkgconfig, mono4, autoreconfHook }: stdenv.mkDerivation rec { name = "dbus-sharp-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged # See: https://github.com/NixOS/nixpkgs/pull/46060 - buildInputs = [ mono48 ]; + buildInputs = [ mono4 ]; dontStrip = true; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index ca72557242f1..43311c29659b 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono48, gtk-sharp-2_0 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mono4, gtk-sharp-2_0 }: stdenv.mkDerivation rec { name = "mono-addins-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; # Use msbuild when https://github.com/NixOS/nixpkgs/pull/43680 is merged - buildInputs = [ mono48 gtk-sharp-2_0 ]; + buildInputs = [ mono4 gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 7e4babbb979b..5d8e347de99d 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -2,7 +2,7 @@ , lib, fetchurl, fetchpatch, fetchFromGitHub , which, findutils, m4, gawk -, python, openjdk, mono58, libressl +, python, openjdk, mono, libressl }: let @@ -50,7 +50,7 @@ let inherit rev sha256; }; - nativeBuildInputs = [ python openjdk gawk which m4 findutils mono58 ]; + nativeBuildInputs = [ python openjdk gawk which m4 findutils mono ]; buildInputs = [ libressl boost ]; patches = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4cbee31b9bf..c27289de138d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3534,9 +3534,7 @@ in jaaa = callPackage ../applications/audio/jaaa { }; - jackett = callPackage ../servers/jackett { - mono = mono514; - }; + jackett = callPackage ../servers/jackett { }; jade = callPackage ../tools/text/sgml/jade { }; @@ -7036,9 +7034,7 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { - mono = mono46; - }; + fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono4; }; fstar = callPackage ../development/compilers/fstar { }; @@ -7351,36 +7347,14 @@ in mlton = mlton20180207; - mono = mono5; - mono5 = mono58; - mono4 = mono48; + mono = mono5; - mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { + mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; }); - mono48 = lowPrio (callPackage ../development/compilers/mono/4.8.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono50 = lowPrio (callPackage ../development/compilers/mono/5.0.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono54 = lowPrio (callPackage ../development/compilers/mono/5.4.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - - mono58 = callPackage ../development/compilers/mono/5.8.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }; - - mono514 = callPackage ../development/compilers/mono/5.14.nix { + mono5 = callPackage ../development/compilers/mono/5.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; }; @@ -13506,7 +13480,7 @@ in elasticmq = callPackage ../servers/elasticmq { }; eventstore = callPackage ../servers/nosql/eventstore { - mono = mono46; + mono = mono4; v8 = v8_6_x; }; @@ -16880,9 +16854,7 @@ in inherit (gnome3) evince; evolution-data-server = gnome3.evolution-data-server; - keepass = callPackage ../applications/misc/keepass { - buildDotnetPackage = buildDotnetPackage.override { mono = mono54; }; - }; + keepass = callPackage ../applications/misc/keepass { }; keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9011f9933213..b5c980080e98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3725,7 +3725,7 @@ in { pythonnet = callPackage ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. - mono = pkgs.mono46; + mono = pkgs.mono4; }; pytz = callPackage ../development/python-modules/pytz { };