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: 8b0f365582ee
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 020e1b0c8e4f
Choose a head ref
  • 6 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 18, 2019

  1. git-series: use cargoPatches rather than cargoDepsHook

    @edef1c
    edef1c committed Oct 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    88d4b40 View commit details

  2. git-series: upgrade Cargo dependencies to allow using OpenSSL 1.1

    @edef1c
    edef1c committed Oct 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    eadwu Edmund Wu
    GPG key ID: 76AA3F9F2BD3E3A0
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f7de72a View commit details

  3. git-series: use nixpkgs libcurl 

    This replaces the vendored copy from curl-sys.
    @edef1c
    edef1c committed Oct 18, 2019
    Copy the full SHA
    2bc9e6c View commit details

  4. git-series: use nixpkgs libgit2 

    This replaces the vendored copy from libgit2-sys.
    @edef1c
    edef1c committed Oct 18, 2019
    Copy the full SHA
    fca5204 View commit details

  5. git-series: add edef as maintainer

    @edef1c
    edef1c committed Oct 18, 2019
    Copy the full SHA
    67b8f4e View commit details

  6. Merge pull request #71334 from edef1c/git-series 

    Clean up git-series packaging, use OpenSSL 1.1
    @worldofpeace
    worldofpeace authored Oct 18, 2019
    Copy the full SHA
    020e1b0 View commit details
Showing with 18 additions and 16 deletions.
  1. +18 −16 pkgs/development/tools/git-series/default.nix
34 changes: 18 additions & 16 deletions pkgs/development/tools/git-series/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl_1_0_2, cmake, perl, pkgconfig, zlib }:
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2 }:

with rustPlatform;

@@ -13,21 +13,23 @@ buildRustPackage rec {
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
};

cargoSha256 = "07b25pcndhwvpwa5khdh8y1fl44hdv6ff2pfj1mjc0wchbspqm6q";

cargoDepsHook = ''
(
cd */
# see https://github.com/git-series/git-series/pull/56
patch -p1 < ${fetchpatch {
url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
}}
)
'';

cargoSha256 = "09y4fvv279cm5sgbpmskascb7rrwqgya5w5wkpz1bgx6pzw3mc7y";

cargoPatches = [
(fetchpatch {
url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
})
# Update Cargo.lock to allow using OpenSSL 1.1
(fetchpatch {
url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch";
sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s";
})
];

LIBGIT2_SYS_USE_PKG_CONFIG = true;
nativeBuildInputs = [ cmake pkgconfig perl ];
buildInputs = [ openssl_1_0_2 zlib ];
buildInputs = [ openssl zlib curl libgit2 ];

postBuild = ''
install -D "$src/git-series.1" "$out/man/man1/git-series.1"
@@ -43,6 +45,6 @@ buildRustPackage rec {
homepage = https://github.com/git-series/git-series;

license = licenses.mit;
maintainers = [ maintainers.vmandela ];
maintainers = with maintainers; [ edef vmandela ];
};
}