Commit a2877cb3 authored by DannyDannyDanny's avatar DannyDannyDanny
Browse files

Merge remote-tracking branch 'upstream/master' into love2d-darwin-clean

parents 42338391 179bd586

pkgs/applications/networking/cluster/kuma/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -16,17 +16,17 @@ 


buildGoModule rec {

  inherit pname;

  version = "2.11.5";

  version = "2.12.0";

  tags = lib.optionals enableGateway [ "gateway" ];



  src = fetchFromGitHub {

    owner = "kumahq";

    repo = "kuma";

    tag = version;

    hash = "sha256-gNojkBMdTbBLnN5Xpbpm7chLfCT+7S8mJTilEABuVis=";

    hash = "sha256-5syQFcYBY/xKipIsAJdjVrXYXt7NNjjCeXiDVNO9NTo=";

  };



  vendorHash = "sha256-Sy67XRPob++DH+pKFY5lZOfc3f1MaP3nI1znnvjYB+M=";

  vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs=";



  # no test files

  doCheck = false;

pkgs/by-name/README.md

+5 −9
Original line number Diff line number Diff line
@@ -62,16 +62,12 @@ The above expression is called using these arguments by default: 
```



But the package might need `pkgs.libbar_2` instead.

While the function could be changed to take `libbar_2` directly as an argument,

this would change the `.override` interface, breaking code like `.override { libbar = ...; }`.

So instead it is preferable to use the same generic parameter name `libbar`

and override its value in [`pkgs/top-level/all-packages.nix`](../top-level/all-packages.nix):

While the `libbar` argument could explicitly be overridden in `all-packages.nix` with `libbar_2`, this would hide important information about this package from its interface.

The fact that the package requires a certain version of `libbar` to work should not be hidden in a separate place.

It is preferable to use `libbar_2` as a argument name instead.



```nix

{

  libfoo = callPackage ../by-name/so/some-package/package.nix { libbar = libbar_2; };

}

```

This approach also has the benefit that, if the expectation of the package changes to require a different version of `libbar`, a downstream user with an override of this argument will receive an error.

This is comparable to a merge conflict in git: It's much better to be forced to explicitly address the conflict instead of silently keeping the override - which might lead to a different problem that is likely much harder to debug.



## Manual migration guidelines

pkgs/by-name/an/anydesk/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "anydesk";

  version = "7.0.2";

  version = "7.1.0";



  src = fetchurl {

    urls = [

      "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz"

      "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz"

    ];

    hash = "sha256-qE49rV/QPYkbyAppDML/n6brzmiA93w47bDOwiKDuUo=";

    hash = "sha256-CplmZZrlnMjmnpOvzFMiSGMnnSNXnXiUtleXi0X52lo=";

  };



  buildInputs = [

pkgs/by-name/bt/btop/package.nix

+7 −4
Original line number Diff line number Diff line
@@ -8,19 +8,20 @@ 
  autoAddDriverRunpath,

  apple-sdk_15,

  versionCheckHook,

  nix-update-script,

  rocmPackages,

  cudaSupport ? config.cudaSupport,

  rocmSupport ? config.rocmSupport,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "btop";

  version = "1.4.5";



  src = fetchFromGitHub {

    owner = "aristocratos";

    repo = "btop";

    rev = "v${version}";

    tag = "v${finalAttrs.version}";

    hash = "sha256-ZLT+Hc1rvBFyhey+imbgGzSH/QaVxIh/jvDKVSmDrA0=";

  };
@@ -55,10 +56,12 @@ stdenv.mkDerivation rec { 
  versionCheckProgramArg = "--version";

  doInstallCheck = true;



  passthru.updateScript = nix-update-script { };



  meta = {

    description = "Monitor of resources";

    homepage = "https://github.com/aristocratos/btop";

    changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md";

    changelog = "https://github.com/aristocratos/btop/blob/v${finalAttrs.version}/CHANGELOG.md";

    license = lib.licenses.asl20;

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

    maintainers = with lib.maintainers; [
@@ -68,4 +71,4 @@ stdenv.mkDerivation rec { 
    ];

    mainProgram = "btop";

  };

}
 
})

pkgs/by-name/la/lazysql/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


buildGoModule rec {

  pname = "lazysql";

  version = "0.4.1";

  version = "0.4.2";



  src = fetchFromGitHub {

    owner = "jorgerojas26";

    repo = "lazysql";

    rev = "v${version}";

    hash = "sha256-M6G0Bp9s1XhgZL9BZDzbJmUmE+UHidpsGIaNt1i7CGw=";

    hash = "sha256-6tPSr28Ja7LuwWrcqSYLxxQj8e9XCgTWxzudjXOriBg=";

  };



  vendorHash = "sha256-NGwCTEh1/5dJWOCSe18FZYYu8v7Mj6MWVEWyNNA1T68=";