Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

libgit2: introduce libgit2_1_8 attribute and init at 1.8.1; cargo-generate: 0.21.1 -> 0.21.3 #333660

Closed
wants to merge 2 commits into from
Closed

libgit2: introduce libgit2_1_8 attribute and init at 1.8.1; cargo-generate: 0.21.1 -> 0.21.3 #333660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
385326a
libgit2: introduce new attribute for 1.8 version
turboMaCk Aug 10, 2024
7ae7b28
cargo-generate: 0.21.1 -> 0.21.3
turboMaCk Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkgs/development/libraries/libgit2/1-7-2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(import ./build-version.nix) {
# also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
version = "1.7.2";
hash = "sha256-fVPY/byE2/rxmv/bUykcAbmUFMlF3UZogVuTzjOXJUU=";
}
5 changes: 5 additions & 0 deletions pkgs/development/libraries/libgit2/1-8-1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(import ./build-version.nix) {
# also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
version = "1.8.1";
hash = "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=";
}
8 changes: 5 additions & 3 deletions ...development/libraries/libgit2/default.nix → ...pment/libraries/libgit2/build-version.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{ version
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This skills be generic.nix

, hash
}:
{ lib
, stdenv
, fetchFromGitHub
Expand All @@ -20,16 +23,15 @@

stdenv.mkDerivation rec {
pname = "libgit2";
version = "1.7.2";
# also check the following packages for updates: python3Packages.pygit2 and libgit2-glib
inherit version;

outputs = ["lib" "dev" "out"];

src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
hash = "sha256-fVPY/byE2/rxmv/bUykcAbmUFMlF3UZogVuTzjOXJUU=";
inherit hash;
};

cmakeFlags = [
Expand Down
10 changes: 5 additions & 5 deletions pkgs/development/tools/rust/cargo-generate/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, libgit2_1_8
, openssl
, stdenv
, darwin
Expand All @@ -11,20 +11,20 @@

rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
version = "0.21.1";
version = "0.21.3";

src = fetchFromGitHub {
owner = "cargo-generate";
repo = "cargo-generate";
rev = "v${version}";
sha256 = "sha256-Pza1MK5yWpuNfaaFAJy5/Pf+t0TN1Hzc5wKcpmMpEf0=";
sha256 = "sha256-1F/865UgdqwfpITFhXCuL7CmducL7w0lVDyfui9UzjU=";
};

cargoHash = "sha256-b6WfsDTAZgxA977JhdlafE+POPvMLl8Z7CzEf+L2+Us=";
cargoHash = "sha256-szPO1V09EThpo2N03Ll+ZJUpvjp2b+/C/sviOzFfG+k=";

nativeBuildInputs = [ pkg-config ];

buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [
buildInputs = [ libgit2_1_8 openssl ] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];

Expand Down
8 changes: 7 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20372,7 +20372,13 @@ with pkgs;

icon-lang = callPackage ../development/interpreters/icon-lang { };

libgit2 = callPackage ../development/libraries/libgit2 {
# Should be flipped for version 1.8.x soon
libgit2 = callPackage ../development/libraries/libgit2/1-7-2.nix {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't flip back the default, just pin packages requiring an old version.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would mean this has to go to staging, which would mean that more Rust stuff will be broken after the 1.80 merge in a few days. We should not flip the default immediately.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SuperSandro2000 Plan is to do exactly that but in next PR that will go to staging. This one is just first step to unblock some merges to master in meantime.

inherit (darwin.apple_sdk.frameworks) Security;
};

# Future default version
libgit2_1_8 = callPackage ../development/libraries/libgit2/1-8-1.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};

Expand Down
Loading