Merge pull request #153451 from Mic92/spidermonkey
spidermonkey_68: drop
This commit is contained in:
ajs124
GitHub
commit
c7c159af4d
6 changed files with 10 additions and 146 deletions
|
|
@ -217,7 +217,6 @@ in {
|
|||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
example = literalExpression "pkgs.mediatomb";
|
||||
default = pkgs.gerbera;
|
||||
defaultText = literalExpression "pkgs.gerbera";
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -1,104 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
|
||||
, which, readline, zlib, icu, cargo, rustc, llvmPackages }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
python3Env = buildPackages.python3.withPackages (p: [p.six]);
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "spidermonkey";
|
||||
version = "68.12.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
|
||||
sha256 = "1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Backport a change from Firefox 75 that fixes finding the
|
||||
# location of clang and libclang.
|
||||
(fetchpatch {
|
||||
url = "https://hg.mozilla.org/mozilla-central/raw-rev/ccd1356fc8f1d0bfa9d896e88d3cc924425623da";
|
||||
sha256 = "005g3mfmal9nw32khrgyiv3221z7pazfhhm2qvgc8d48i2yzj3j0";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
setOutputFlags = false; # Configure script only understands --includedir
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf213
|
||||
pkg-config
|
||||
perl
|
||||
which
|
||||
python2
|
||||
zip
|
||||
cargo
|
||||
rustc
|
||||
llvmPackages.llvm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
readline
|
||||
zlib
|
||||
icu
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export CXXFLAGS="-fpermissive"
|
||||
export LIBXUL_DIST=$out
|
||||
export PYTHON3="${python3Env.interpreter}"
|
||||
|
||||
# We can't build in js/src/, so create a build dir
|
||||
mkdir obj
|
||||
cd obj/
|
||||
configureScript=../js/src/configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
# Reccommended by gjs upstream
|
||||
"--disable-jemalloc"
|
||||
"--enable-unaligned-private-values"
|
||||
"--with-intl-api"
|
||||
"--enable-posix-nspr-emulation"
|
||||
"--with-system-zlib"
|
||||
"--with-system-icu"
|
||||
|
||||
"--enable-shared-js"
|
||||
"--enable-readline"
|
||||
# Fedora and Arch disable optimize, but it doesn't seme to be necessary
|
||||
# It turns on -O3 which some gcc version had a problem with:
|
||||
# https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e
|
||||
"--enable-optimize"
|
||||
"--enable-release"
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# Spidermonkey seems to use different host/build terminology for cross
|
||||
# compilation here.
|
||||
"--host=${stdenv.buildPlatform.config}"
|
||||
"--target=${stdenv.hostPlatform.config}"
|
||||
];
|
||||
|
||||
# mkDerivation by default appends --build/--host to configureFlags when cross compiling
|
||||
# These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list
|
||||
configurePlatforms = [];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
# Remove unnecessary static lib
|
||||
preFixup = ''
|
||||
moveToOutput bin/js60-config "$dev"
|
||||
rm $out/lib/libjs_static.ajs
|
||||
ln -s $out/bin/js60 $out/bin/js
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mozilla's JavaScript engine written in C/C++";
|
||||
homepage = "https://developer.mozilla.org/en/SpiderMonkey";
|
||||
license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license.
|
||||
maintainers = [ maintainers.abbradar ];
|
||||
badPlatforms = [ "riscv32-linux" "riscv64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,8 +5,8 @@
|
|||
, zlib
|
||||
, dbus
|
||||
, networkmanager
|
||||
, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_68
|
||||
, spidermonkey_68
|
||||
, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_78
|
||||
, spidermonkey_78
|
||||
, pcre
|
||||
, gsettings-desktop-schemas
|
||||
, glib
|
||||
|
|
@ -17,9 +17,7 @@
|
|||
, JavaScriptCore
|
||||
}:
|
||||
|
||||
let
|
||||
jsRuntime = if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_68;
|
||||
in stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libproxy";
|
||||
version = "0.4.17";
|
||||
|
||||
|
|
@ -43,7 +41,7 @@ in stdenv.mkDerivation rec {
|
|||
python3
|
||||
zlib
|
||||
] ++ lib.optionals enableJavaScript [
|
||||
jsRuntime
|
||||
(if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_78)
|
||||
] ++ (if stdenv.hostPlatform.isDarwin then [
|
||||
SystemConfiguration
|
||||
CoreFoundation
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
{ lib, stdenv, fetchgit
|
||||
, sqlite, expat, mp4v2, flac, spidermonkey_68, taglib, libexif, curl, ffmpeg, file
|
||||
, pkg-config, autoreconfHook, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediatomb";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchgit {
|
||||
url = meta.repositories.git;
|
||||
rev = "7ab761696354868bd5d67ff4f2d849994e4c98e2";
|
||||
sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd";
|
||||
};
|
||||
|
||||
buildInputs = [ sqlite expat spidermonkey_68 taglib libexif curl ffmpeg file mp4v2 flac
|
||||
pkg-config autoreconfHook ];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) mediatomb; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://mediatomb.cc";
|
||||
repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb";
|
||||
description = "UPnP MediaServer with a web user interface";
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -604,6 +604,7 @@ mapAliases ({
|
|||
mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15
|
||||
matrique = spectral; # added 2020-01-27
|
||||
mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08
|
||||
mediatomb = throw "mediatomb is no longer maintained upstream, use gerbera instead"; # added 2022-01-04
|
||||
meme = meme-image-generator; # added 2021-04-21
|
||||
mess = mame; # added 2019-10-30
|
||||
metamorphose2 = throw "metamorphose2 has been removed from nixpkgs, as it was stuck on python2."; # added 2022-01-12
|
||||
|
|
@ -994,9 +995,10 @@ mapAliases ({
|
|||
spice_gtk = spice-gtk; # added 2018-02-25
|
||||
spice_protocol = spice-protocol; # added 2018-02-25
|
||||
spidermonkey_1_8_5 = throw "spidermonkey_1_8_5 has been removed, because it is based on Firefox 4.0 from 2011."; # added 2021-05-03
|
||||
spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
|
||||
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_78 instead."; # added 2019-10-16
|
||||
spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_78 instead."; # added 2021-03-21
|
||||
spidermonkey_38 = throw "spidermonkey_38 has been removed. Please use spidermonkey_91 instead."; # added 2021-03-21
|
||||
spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_91 instead."; # added 2019-10-16
|
||||
spidermonkey_60 = throw "spidermonkey_60 has been removed. Please use spidermonkey_91 instead."; # added 2021-03-21
|
||||
spidermonkey_68 = throw "spidermonkey_68 has been removed. Please use spidermonkey_91 instead."; # added 2022-01-04
|
||||
spring-boot = spring-boot-cli; # added 2020-04-24
|
||||
sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
|
||||
sqliteInteractive = sqlite-interactive; # added 2014-12-06
|
||||
|
|
@ -1149,7 +1151,7 @@ mapAliases ({
|
|||
|
||||
gnome_user_docs = gnome-user-docs; # added 2019-11-20
|
||||
# spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
|
||||
spidermonkey = spidermonkey_78; # added 2020-10-09
|
||||
spidermonkey = spidermonkey_91; # added 2020-10-09
|
||||
libtorrentRasterbar = libtorrent-rasterbar; # added 2020-12-20
|
||||
libtorrentRasterbar-2_0_x = libtorrent-rasterbar-2_0_x; # added 2020-12-20
|
||||
libtorrentRasterbar-1_2_x = libtorrent-rasterbar-1_2_x; # added 2020-12-20
|
||||
|
|
|
|||
|
|
@ -14018,7 +14018,6 @@ with pkgs;
|
|||
|
||||
sparkleshare = callPackage ../applications/version-management/sparkleshare { };
|
||||
|
||||
spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { };
|
||||
spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { };
|
||||
spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { };
|
||||
|
||||
|
|
@ -21392,8 +21391,6 @@ with pkgs;
|
|||
|
||||
mbtileserver = callPackage ../servers/mbtileserver { };
|
||||
|
||||
mediatomb = callPackage ../servers/mediatomb { };
|
||||
|
||||
memcached = callPackage ../servers/memcached {};
|
||||
|
||||
meteor = callPackage ../servers/meteor { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue