Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d5c26dd063b6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ca6b64ae7bba
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 3, 2018

  1. tectonic: fix darwin build 

    (cherry picked from commit 8f2102d)
    @mbode @LnL7
    mbode authored and LnL7 committed Apr 3, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cbccde9 View commit details

  2. nixos/version: fix nixops pre 1.6 compatibility 

    We should be able to deploy a NixOS 18.03 system with the current nixops
stable release. Some options were renamed, so instead of
`mkRenamedOptionModule` we introduce them as read-only interal options
that won't be rendered in the manual.

Only the options that are needed to make nixops evaluations succeed were
added.

This commit should probably be reverted after or before the 18.09 release,
depending on the nixops 1.6 release.

The user will not get the warning that these have been renamed but
this change is mentioned in the release notes.

Fixes #34253.

(cherry picked from commit 70c6f65)
    @fpletz
    fpletz committed Apr 3, 2018
    Copy the full SHA
    ca6b64a View commit details
Showing with 20 additions and 4 deletions.
  1. +15 −0 nixos/modules/misc/version.nix
  2. +2 −2 nixos/modules/rename.nix
  3. +3 −2 pkgs/tools/typesetting/tectonic/default.nix
15 changes: 15 additions & 0 deletions nixos/modules/misc/version.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,21 @@ in

options.system = {

# XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations
# XXX: Remove after nixops has been bumped to a compatible version
nixosVersion = mkOption {
readOnly = true;
internal = true;
type = types.str;
default = config.system.nixos.version;
};
nixosVersionSuffix = mkOption {
readOnly = true;
internal = true;
type = types.str;
default = config.system.nixos.versionSuffix;
};

nixos.version = mkOption {
internal = true;
type = types.str;
4 changes: 2 additions & 2 deletions nixos/modules/rename.nix
View file
Original file line number Diff line number Diff line change
@@ -196,9 +196,9 @@ with lib;
(mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])

# misc/version.nix
(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
#(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
(mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
#(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
(mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
(mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
(mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])
5 changes: 3 additions & 2 deletions pkgs/tools/typesetting/tectonic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper
, fontconfig, harfbuzz-icu, openssl, pkgconfig }:
, darwin, fontconfig, harfbuzz-icu, openssl, pkgconfig }:

rustPlatform.buildRustPackage rec {
name = "tectonic-${version}";
@@ -16,7 +16,8 @@ rustPlatform.buildRustPackage rec {

nativeBuildInputs = [ pkgconfig ];

buildInputs = [ fontconfig harfbuzz-icu openssl ];
buildInputs = [ fontconfig harfbuzz-icu openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);

# tests fail due to read-only nix store
doCheck = false;