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

Commits on Jan 4, 2018

  1. Fix copy-tarballs.pl 

    (cherry picked from commit 1b0f696)
    @edolstra
    edolstra committed Jan 4, 2018
    Copy the full SHA
    0ebe88d View commit details

  2. Finance::Quote: 1.38 -> 1.47 

    (cherry picked from commit eaf2877)

(Cherry-picking this due to the disappearence of Yahoo as a quote
source.)
    @edolstra
    edolstra committed Jan 4, 2018
    Copy the full SHA
    81947ef View commit details
Showing with 4 additions and 3 deletions.
  1. +2 −1 maintainers/scripts/copy-tarballs.pl
  2. +2 −2 pkgs/top-level/perl-packages.nix
3 changes: 2 additions & 1 deletion maintainers/scripts/copy-tarballs.pl
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable
#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp nixUnstable nixUnstable.perl-bindings

# This command uploads tarballs to tarballs.nixos.org, the
# content-addressed cache used by fetchurl as a fallback for when
@@ -59,6 +59,7 @@ sub usage {
{ aws_access_key_id => $aws_access_key_id,
aws_secret_access_key => $aws_secret_access_key,
retry => 1,
host => "s3-eu-west-1.amazonaws.com",
});

my $bucket = $s3->bucket("nixpkgs-tarballs") or die;
4 changes: 2 additions & 2 deletions pkgs/top-level/perl-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5790,10 +5790,10 @@ let self = _self // overrides; _self = with self; {
};

FinanceQuote = buildPerlPackage rec {
name = "Finance-Quote-1.38";
name = "Finance-Quote-1.47";
src = fetchurl {
url = "mirror://cpan/authors/id/E/EC/ECOCODE/${name}.tar.gz";
sha256 = "0zhqb27y4vdxn476s2kwm9zl2f970yjcyyybnjm9b406krr2fm59";
sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7";
};
propagatedBuildInputs = [
CGI CryptSSLeay HTMLTableExtract HTMLTree HTTPMessage LWP LWPProtocolHttps MozillaCA