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

Commits on Jul 23, 2017

  1. rustRegistry: 2017-06-27 -> 2017-07-23

    @bennofs
    bennofs committed Jul 23, 2017
    Copy the full SHA
    adf756d View commit details

  2. nix-index: init at 0.1.0

    @bennofs
    bennofs committed Jul 23, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    globin Robin Gloster
    GPG key ID: 5E4C836C632C2882
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1d1735c View commit details
Showing with 37 additions and 3 deletions.
  1. +32 −0 pkgs/tools/package-management/nix-index/default.nix
  2. +2 −0 pkgs/top-level/all-packages.nix
  3. +3 −3 pkgs/top-level/rust-packages.nix
32 changes: 32 additions & 0 deletions pkgs/tools/package-management/nix-index/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ lib, rustPlatform, fetchFromGitHub, pkgconfig, openssl, curl }:

with rustPlatform;

buildRustPackage rec {
name = "nix-index-${version}";
version = "0.1.0";

src = fetchFromGitHub {
owner = "bennofs";
repo = "nix-index";
rev = "v${version}";
sha256 = "1lmg65yqkwf2a5qxm3dmv8158kqhnriir062vlgar5wimf409rm5";
};
depsSha256 = "0v145fi9bfiwvsdy7hz9lw4m2f2j8sxvixfzmjwfnq4klm51c8yl";
buildInputs = [pkgconfig openssl curl];

postInstall = ''
mkdir -p $out/etc/profile.d
cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh
substituteInPlace $out/etc/profile.d/command-not-found.sh \
--replace "@out@" "$out"
'';

meta = with lib; {
description = "A files database for nixpkgs";
homepage = https://github.com/bennofs/nix-index;
license = with licenses; [ bsd3 ];
maintainers = [ maintainers.bennofs ];
platforms = platforms.all;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18674,6 +18674,8 @@ with pkgs;

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

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

inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
nix-prefetch-bzr
nix-prefetch-cvs
6 changes: 3 additions & 3 deletions pkgs/top-level/rust-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@
{ stdenv, fetchFromGitHub, git }:

stdenv.mkDerivation {
name = "rustRegistry-2017-07-17";
name = "rustRegistry-2017-07-23";

src = fetchFromGitHub {
owner = "rust-lang";
repo = "crates.io-index";
rev = "14f1d497ede721229b23ad1e8b6122f34761f1a6";
sha256 = "1a9aav9yg7ffrilsnzlbaysxgzfzg455jfdh260n9y6wvpnpfvg9";
rev = "ed8e6a6761278861db046073cc69d6a5e7dd8c15";
sha256 = "1v72m0h31xcay2m64n2wil5wqnl8z4n4adxxpdllcpgj3pj5jai6";
};
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''