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

Commits on Oct 29, 2019

  1. pazi: 0.3.0 -> 0.4.0

    @marsam
    marsam committed Oct 29, 2019
    Copy the full SHA
    fc721de View commit details

  2. Merge pull request #72238 from marsam/update-pazi 

    pazi: 0.3.0 -> 0.4.0
    @lsix
    lsix authored Oct 29, 2019
    Copy the full SHA
    b04d88f View commit details
Showing with 11 additions and 11 deletions.
  1. +8 −8 pkgs/tools/misc/pazi/cargo-lock.patch
  2. +3 −3 pkgs/tools/misc/pazi/default.nix
16 changes: 8 additions & 8 deletions pkgs/tools/misc/pazi/cargo-lock.patch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index 074b0ca..22f3bc5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -286,7 +286,7 @@ dependencies = [
diff --git i/Cargo.lock w/Cargo.lock
index b39a076..03a2757 100644
--- i/Cargo.lock
+++ w/Cargo.lock
@@ -281,7 +281,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

[[package]]
name = "pazi"
-version = "0.2.0"
+version = "0.3.0"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
6 changes: 3 additions & 3 deletions pkgs/tools/misc/pazi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,18 @@

rustPlatform.buildRustPackage rec {
pname = "pazi";
version = "0.3.0";
version = "0.4.0";

src = fetchFromGitHub {
owner = "euank";
repo = pname;
rev = "v${version}";
sha256 = "1gnh6047hacavcb9bhps9d1zjns66rdbd158fw20kjp1lln5srrn";
sha256 = "1bbci7bvrwl7lsslf302jham1pcw32fi7nwgqyjpfjyzvnpfgndz";
};

buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];

cargoSha256 = "15s03vwgl6562n5h9r4d5kp2r168jakn5nwnyibmrs8r5q0idmjs";
cargoSha256 = "0nqcp54nwv4ic5jc3cgg15rh8dgkixfgkwb5q47rv8ding4cd0j5";

cargoPatches = [ ./cargo-lock.patch ];