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: e0a544ccfc82
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: 482ba41d6ec1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 2, 2019

  1. xterm: 348 -> 349 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xterm/versions

(cherry picked from commit 3062ec7)
    @r-ryantm @Ma27
    r-ryantm authored and Ma27 committed Oct 2, 2019
    Copy the full SHA
    1f65fe6 View commit details

  2. lib.mkRemovedOptionModule: Show replacement for option usage too 

    Previously mkRemovedOptionModule would only show the replacement
instructions when the removed option was *defined*. With this change, it
also does so when an option is *used*.

This is essential for options that are only intended to be used such as
`security.acme.directory`, whose replacement instructions would never
trigger without this change because almost everybody only uses the
option and isn't defining it.

(cherry picked from commit ebb136d)
    @infinisil
    infinisil committed Oct 2, 2019
    Copy the full SHA
    482ba41 View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −0 lib/modules.nix
  2. +2 −2 pkgs/applications/misc/xterm/default.nix
1 change: 1 addition & 0 deletions lib/modules.nix
View file
Original file line number Diff line number Diff line change
@@ -591,6 +591,7 @@ rec {
{ options, ... }:
{ options = setAttrByPath optionName (mkOption {
visible = false;
apply = x: throw "The option `${showOption optionName}' can no longer be used since it's been removed. ${replacementInstructions}";
});
config.assertions =
let opt = getAttrFromPath optionName options; in [{
4 changes: 2 additions & 2 deletions pkgs/applications/misc/xterm/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
}:

stdenv.mkDerivation rec {
name = "xterm-348";
name = "xterm-349";

src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${name}.tgz"
"https://invisible-mirror.net/archives/xterm/${name}.tgz"
];
sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb";
sha256 = "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir";
};

buildInputs =