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: 30cd233df1f5
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: 9c26d7939c37
Choose a head ref
  • 6 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 9, 2020

  1. [20.03] sit: mark as broken 

    Dependencies in the Cargo.lock fail to build due to mutable self borrows.

Backport of NixOS/nixpkgs#82018

ZHF: NixOS/nixpkgs#80379

(cherry picked from commit a2514c2)
    @bhipple
    bhipple committed Mar 9, 2020
    Copy the full SHA
    a81880d View commit details

  2. [ZHF][20.03] heatseeker: 1.5.1 -> 1.7.1 

    Backport of NixOS/nixpkgs#82017

ZHF: #80379

(cherry picked from commit 9044bde)
    @bhipple
    bhipple committed Mar 9, 2020
    Copy the full SHA
    da79582 View commit details

  3. Merge pull request #82106 from bhipple/bp/sit 

    [20.03] sit: mark as broken
    @marsam
    marsam authored Mar 9, 2020
    Copy the full SHA
    45138d3 View commit details

  4. [20.03] ion: mark as broken 

    Backport of NixOS/nixpkgs#82016

ZHF: #80379

(cherry picked from commit d5d648b)
    @bhipple
    bhipple committed Mar 9, 2020
    Copy the full SHA
    dde4748 View commit details

  5. Merge pull request #82108 from bhipple/bp/heatseeker 

    [20.03] heatseeker: 1.5.1 -> 1.7.1
    @marsam
    marsam authored Mar 9, 2020
    Copy the full SHA
    d02d2b0 View commit details

  6. Merge pull request #82113 from bhipple/bp/ion 

    [20.03] ion: mark as broken
    @marsam
    marsam authored Mar 9, 2020
    Copy the full SHA
    9c26d79 View commit details
Showing with 13 additions and 10 deletions.
  1. +4 −1 pkgs/applications/version-management/sit/default.nix
  2. +4 −2 pkgs/shells/ion/default.nix
  3. +5 −7 pkgs/tools/misc/heatseeker/default.nix
5 changes: 4 additions & 1 deletion pkgs/applications/version-management/sit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg,
{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip, gnupg,
# Darwin
libiconv, CoreFoundation, Security }:

@@ -28,5 +28,8 @@ rustPlatform.buildRustPackage rec {
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ dywedir yrashk ];
platforms = platforms.all;
# Upstream has not had a release in several years, and dependencies no
# longer compile with the latest Rust compiler.
broken = true;
};
}
6 changes: 4 additions & 2 deletions pkgs/shells/ion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,10 +21,12 @@ buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ dywedir ];
platforms = platforms.all;
broken = stdenv.isDarwin;
# This has not had a release since 2017, and no longer compiles with the
# latest Rust compiler.
broken = false;
};

passthru = {
shellPath = "/bin/ion";
shellPath = "/bin/ion";
};
}
12 changes: 5 additions & 7 deletions pkgs/tools/misc/heatseeker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
{ stdenv, fetchFromGitHub, rustPlatform }:

with rustPlatform;

buildRustPackage rec {
rustPlatform.buildRustPackage rec {
pname = "heatseeker";
version = "1.5.1";
version = "1.7.1";

src = fetchFromGitHub {
owner = "rschmitt";
repo = "heatseeker";
rev = "v${version}";
sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7";
sha256 = "1x7mdyf1m17s55f6yjdr1j510kb7a8f3zkd7lb2kzdc7nd3vgaxg";
};

cargoSha256 = "0m3sxbz1iii31s30cnv1970i1mwfhl6gm19k8wv0n7zji30ayx07";
cargoSha256 = "0qfjsgfywp3brmmkp6nmwnwp0gwljyi3ddfa35kzfqylsdn1x91b";

# some tests require a tty, this variable turns them off for Travis CI,
# which we can also make use of
TRAVIS = "true";

meta = with stdenv.lib; {
description = "A general-purpose fuzzy selector";
homepage = https://github.com/rschmitt/heatseeker;
homepage = "https://github.com/rschmitt/heatseeker";
license = licenses.mit;
maintainers = [ maintainers.michaelpj ];
platforms = platforms.unix;