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: 0d7ca4ff088a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2628f20267d0
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 16, 2020

  1. topgrade: fix, add darwin Foundation framework

    @HugoReeves
    HugoReeves committed Jan 16, 2020
    Copy the full SHA
    8bef411 View commit details

  2. topgrade: add maintainer, hugoreeves

    @HugoReeves
    HugoReeves committed Jan 16, 2020
    Copy the full SHA
    212e7ea View commit details

Commits on Jan 17, 2020

  1. topgrade: fix, add darwin Foundation framework (#77700) 

    topgrade: fix, add darwin Foundation framework
    @kalbasit
    kalbasit authored Jan 17, 2020
    Copy the full SHA
    2628f20 View commit details
Showing with 8 additions and 4 deletions.
  1. +5 −3 pkgs/tools/misc/topgrade/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
8 changes: 5 additions & 3 deletions pkgs/tools/misc/topgrade/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, lib, fetchFromGitHub, rustPlatform, Foundation }:

rustPlatform.buildRustPackage rec {
pname = "topgrade";
@@ -13,11 +13,13 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "1y85hl7xl60vsj3ivm6pyd6bvk39wqg25bqxfx00r9myha94iqmd";

meta = with stdenv.lib; {
buildInputs = lib.optional stdenv.isDarwin Foundation;

meta = with lib; {
description = "Upgrade all the things";
homepage = "https://github.com/r-darwish/topgrade";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ filalex77 ];
maintainers = with maintainers; [ filalex77 hugoreeves ];
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6798,7 +6798,9 @@ in

toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { };

topgrade = callPackage ../tools/misc/topgrade { };
topgrade = callPackage ../tools/misc/topgrade {
inherit (darwin.apple_sdk.frameworks) Foundation;
};

tor = callPackage ../tools/security/tor {
# remove this, when libevent's openssl is upgraded to 1_1_0 or newer.