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

Commits on Nov 20, 2018

  1. xsv: Add darwin.Security as dependency on MacOS

    @daniels
    daniels authored Nov 20, 2018
    Copy the full SHA
    b8fbaeb View commit details

Commits on Nov 21, 2018

  1. xsv: Pass Security framework from all-packages

    Daniel Sandbecker committed Nov 21, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fcac08f View commit details

  2. Merge pull request #50836 from daniels/patch-3 

    xsv: Add darwin.Security as dependency on MacOS
    @LnL7
    LnL7 authored Nov 21, 2018
    Copy the full SHA
    ed97417 View commit details
Showing with 6 additions and 2 deletions.
  1. +3 −1 pkgs/tools/text/xsv/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
4 changes: 3 additions & 1 deletion pkgs/tools/text/xsv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform, Security }:

rustPlatform.buildRustPackage rec {
name = "xsv-${version}";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {

cargoSha256 = "1qk5wkjm3d4dz5fldlq7rjlm602v0l04hxrbar2j6vhcz9w2r4n6";

buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

meta = with stdenv.lib; {
description = "A fast CSV toolkit written in Rust";
homepage = https://github.com/BurntSushi/xsv;
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -6330,7 +6330,9 @@ with pkgs;

xsel = callPackage ../tools/misc/xsel { };

xsv = callPackage ../tools/text/xsv { };
xsv = callPackage ../tools/text/xsv {
inherit (darwin.apple_sdk.frameworks) Security;
};

xtreemfs = callPackage ../tools/filesystems/xtreemfs {
boost = boost165;