Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f4c02202cadc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e31062299994
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 27, 2018

  1. nixos/installation-device: Move systemPackages additions to profiles/… 

    …base

Other package additions are there as well.
    @dezgeg
    dezgeg committed Oct 27, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    zimbatm Jonas Chevalier
    GPG key ID: 71BAF6D40C1D63D7
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cc92fc0 View commit details

  2. nixos/installation-cd-minimal: Drop fontconfig 

    Shouldn't be needed for anything.
    @dezgeg
    dezgeg committed Oct 27, 2018
    Copy the full SHA
    ad7f2d1 View commit details

  3. spidermonkey_52: Split into multiple outputs (and nuke static lib) 

    Saves 28M.
    @dezgeg
    dezgeg committed Oct 27, 2018
    Copy the full SHA
    e310622 View commit details
2 changes: 2 additions & 0 deletions nixos/modules/installer/cd-dvd/installation-cd-minimal.nix
View file
Original file line number Diff line number Diff line change
@@ -7,4 +7,6 @@
imports =
[ ./installation-cd-base.nix
];

fonts.fontconfig.enable = false;
}
3 changes: 3 additions & 0 deletions nixos/modules/profiles/base.nix
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,9 @@
pkgs.cryptsetup # needed for dm-crypt volumes
pkgs.mkpasswd # for generating password files

# Some text editors.
pkgs.vim

# Some networking tools.
pkgs.fuse
pkgs.fuse3
3 changes: 0 additions & 3 deletions nixos/modules/profiles/installation-device.nix
View file
Original file line number Diff line number Diff line change
@@ -87,9 +87,6 @@ with lib;
# console less cumbersome if the machine has a public IP.
networking.firewall.logRefusedConnections = mkDefault false;

environment.systemPackages = [ pkgs.vim ];


# Allow the user to log in as root without a password.
users.users.root.initialHashedPassword = "";
};
10 changes: 10 additions & 0 deletions pkgs/development/interpreters/spidermonkey/52.nix
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,9 @@ in stdenv.mkDerivation rec {
sha256 = "1mlx34fgh1kaqamrkl5isf0npch3mm6s4lz3jsjb7hakiijhj7f0";
};

outputs = [ "out" "dev" ];
setOutputFlags = false; # Configure script only understands --includedir

buildInputs = [ readline icu zlib nspr ];
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];

@@ -32,6 +35,7 @@ in stdenv.mkDerivation rec {
export CXXFLAGS="-fpermissive"
export LIBXUL_DIST=$out
export PYTHON="${python2.interpreter}"
configureFlagsArray+=("--includedir=$dev/include")
cd js/src
@@ -49,6 +53,12 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

postInstall = ''
moveToOutput bin/js52-config "$dev"
# Nuke a static lib.
rm $out/lib/libjs_static.ajs
'';

meta = with stdenv.lib; {
description = "Mozilla's JavaScript engine written in C/C++";
homepage = https://developer.mozilla.org/en/SpiderMonkey;