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

Commits on Oct 25, 2018

  1. nix-index: 0.1.1 -> 0.1.2 

    (cherry picked from commit bd4301a)
    @cocreature @lheckemann
    cocreature authored and lheckemann committed Oct 25, 2018
    Copy the full SHA
    540c636 View commit details

  2. nix-index: fix darwin build 

    (cherry picked from commit 5c14dec)
    @LnL7 @lheckemann
    LnL7 authored and lheckemann committed Oct 25, 2018
    Copy the full SHA
    fadacd1 View commit details

  3. Merge pull request #49109 from mayflower/nix-index-backport 

    nix-index: backport version bump and build fix
    @lheckemann
    lheckemann authored Oct 25, 2018
    Copy the full SHA
    30068ec View commit details
Showing with 13 additions and 10 deletions.
  1. +10 −9 pkgs/tools/package-management/nix-index/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
19 changes: 10 additions & 9 deletions pkgs/tools/package-management/nix-index/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }:
{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl
, Security
}:

with rustPlatform;

buildRustPackage rec {
rustPlatform.buildRustPackage rec {
name = "nix-index-${version}";
version = "0.1.1";
version = "0.1.2";

src = fetchFromGitHub {
owner = "bennofs";
repo = "nix-index";
rev = "v${version}";
sha256 = "17pms3cq3i3jan1irxgqfr3nrjy6zb21y07pwqp9v08hyrjpfqin";
sha256 = "05fqfwz34n4ijw7ydw2n6bh4bv64rhks85cn720sy5r7bmhfmfa8";
};
cargoSha256 = "0b7xwcgjds80g08sx91lqip8syb52n458si4q4xycvvsand5fa10";
cargoSha256 = "045qm7cyg3sdvf22i8b9cz8gsvggs5bn9xz8k1pvn5gxb7zj24cx";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl curl];
buildInputs = [ openssl curl ]
++ stdenv.lib.optional stdenv.isDarwin Security;

postInstall = ''
mkdir -p $out/etc/profile.d
@@ -23,7 +24,7 @@ buildRustPackage rec {
--replace "@out@" "$out"
'';

meta = with lib; {
meta = with stdenv.lib; {
description = "A files database for nixpkgs";
homepage = https://github.com/bennofs/nix-index;
license = with licenses; [ bsd3 ];
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -21694,7 +21694,9 @@ with pkgs;
nix-info = callPackage ../tools/nix/info { };
nix-info-tested = nix-info.override { doCheck = true; };

nix-index = callPackage ../tools/package-management/nix-index { };
nix-index = callPackage ../tools/package-management/nix-index {
inherit (darwin.apple_sdk.frameworks) Security;
};

nix-pin = callPackage ../tools/package-management/nix-pin { };