Closed
Conversation
- 6.8 kernel support added - aligned to Nix standard build environment - test added - redundant installPhase and postFixup definitions removed Signed-off-by: birkb <[email protected]>
github-actions
bot
added
the
6.topic: nixos
birkb
requested review from
SuperSandro2000,
Thesola10 and
astro
and removed request for
astro
Thesola10
approved these changes
May 15, 2024
ofborg
bot
added
11.by: package-maintainer
wegank
added
the
12.approvals: 1
| src = fetchurl { | ||
| url = "https://pkg.linbit.com//downloads/drbd/9/drbd-${version}.tar.gz"; | ||
| hash = "sha256-LqK1lPucab7wKvcB4VKGdvBIq+K9XtuO2m0DP5XtK3M="; | ||
| url = "https://pkg.linbit.com//downloads/drbd/9/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; |
Member
There was a problem hiding this comment.
Suggested change
| url = "https://pkg.linbit.com//downloads/drbd/9/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; | |
| url = "https://pkg.linbit.com//downloads/drbd/9/drbd-${finalAttrs.version}.tar.gz"; |
finalAttrs.pname is in many usecases wrong, as when we would append something like headless to pname, then the download URL would be broken
Contributor
Author
There was a problem hiding this comment.
Thanks for the hint. What would be the correct variable and do you maybe have a link to the related documentation?
Contributor
There was a problem hiding this comment.
Don't use pname in URLs, just use the string literal.
| @@ -0,0 +1,19 @@ | |||
| import ./make-test-python.nix ({ lib, pkgs, ... }: { | |||
| name = "drbd-driver"; | |||
| meta.maintainers = with pkgs.lib.maintainers; [ birkb ]; | |||
Member
There was a problem hiding this comment.
Suggested change
| meta.maintainers = with pkgs.lib.maintainers; [ birkb ]; | |
| meta.maintainers = with lib.maintainers; [ birkb ]; |
eclairevoyant
suggested changes
Jul 15, 2024
Contributor
eclairevoyant
left a comment
eclairevoyant
left a comment
There was a problem hiding this comment.
as mentioned earlier - we should never use finalAttrs.pname in a url
JohnRTitor
requested changes
Jul 31, 2024
Member
JohnRTitor
left a comment
JohnRTitor
left a comment
There was a problem hiding this comment.
Perhaps we could fetch from the GitHub repo instead?
diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix
index c2e222ad2f1f..8f4b84800f72 100644
--- a/pkgs/os-specific/linux/drbd/driver.nix
+++ b/pkgs/os-specific/linux/drbd/driver.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, fetchurl, kernel, nixosTests, flex, coccinelle, python3 }:
+{ stdenv, lib, fetchFromGitHub, kernel, nixosTests, flex, coccinelle, python3 }:
stdenv.mkDerivation (finalAttrs: {
pname = "drbd";
- version = "9.2.9";
+ version = "9.2.10";
- src = fetchurl {
- url = "https://pkg.linbit.com//downloads/drbd/9/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
- hash = "sha256-MLG0hGvAjjkNxhszbpnb8fkzWUQC1zPhkeOaU0V5x3g=";
+ src = fetchFromGitHub {
+ owner = "LINBIT";
+ repo = "drbd";
+ rev = "drbd-${finalAttrs.version}";
+ hash = "sha256-O77nVnbk0rSS2vI/+jG1jgDIiFmttGFNUgnw3x6WqPk=";
};
hardeningDisable = [ "pic" ];
Contributor
Author
|
wegank
added
the
2.status: merge conflict
This was referenced Nov 29, 2024
Signed-off-by: birkb <[email protected]>
wegank
removed
the
12.approvals: 1
ofborg
bot
removed
the
2.status: merge conflict
Member
|
closed in favor of the PR that updates straight to 9.2.12 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.