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

Commits on Jan 24, 2020

  1. httplz: 1.6.0 -> 1.8.0

    @bbigras
    bbigras committed Jan 24, 2020
    Copy the full SHA
    11af4a1 View commit details

  2. Merge pull request #78440 from bbigras/httplz 

    httplz: 1.6.0 -> 1.8.0
    @mmahut
    mmahut authored Jan 24, 2020
    Copy the full SHA
    e197a17 View commit details
Showing with 245 additions and 172 deletions.
  1. +242 −169 pkgs/tools/networking/httplz/cargo-lock.patch
  2. +3 −3 pkgs/tools/networking/httplz/default.nix
411 changes: 242 additions & 169 deletions pkgs/tools/networking/httplz/cargo-lock.patch
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pkgs/tools/networking/httplz/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

rustPlatform.buildRustPackage rec {
pname = "httplz";
version = "1.6.0";
version = "1.8.0";

src = fetchFromGitHub {
owner = "thecoshman";
repo = "http";
rev = "v${version}";
sha256 = "1y9mlbympb19i3iw7s7jm7lvkpcl4w0sig6jnd4w3ykhkdhzh6di";
sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw";
};

nativeBuildInputs = [ makeWrapper ];
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {

cargoBuildFlags = [ "--bin httplz" ];
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1bxh7p2a04lpghqms8cx1f1cq5nbcx6cxh5ac7i72d5vzy4v07nl";
cargoSha256 = "1ajxfvj1pv6yq84zgrh7vjzghpb2y8qd5r09gzwdvww5rbj920fq";

postInstall = ''
wrapProgram $out/bin/httplz \