Commit f32cee9f authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Merge remote-tracking branch 'origin/master' into staging-next

parents d267d265 6e51c97f

doc/stdenv/meta.chapter.md

+2 −48
Original line number Diff line number Diff line
@@ -11,58 +11,12 @@ meta = with lib; { 
  '';

  homepage = "https://www.gnu.org/software/hello/manual/";

  license = licenses.gpl3Plus;

  maintainers = [ maintainers.eelco ];

  maintainers = with maintainers; [ eelco ];

  platforms = platforms.all;

};

```



Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package. The value of a meta-attribute must be a string.



The meta-attributes of a package can be queried from the command-line using `nix-env`:



```ShellSession

$ nix-env -qa hello --json

{

    "hello": {

        "meta": {

            "description": "A program that produces a familiar, friendly greeting",

            "homepage": "https://www.gnu.org/software/hello/manual/",

            "license": {

                "fullName": "GNU General Public License version 3 or later",

                "shortName": "GPLv3+",

                "url": "http://www.fsf.org/licensing/licenses/gpl.html"

            },

            "longDescription": "GNU Hello is a program that prints \"Hello, world!\" when you run it.\nIt is fully customizable.\n",

            "maintainers": [

                "Ludovic Court\u00e8s <ludo@gnu.org>"

            ],

            "platforms": [

                "i686-linux",

                "x86_64-linux",

                "armv5tel-linux",

                "armv7l-linux",

                "mips32-linux",

                "x86_64-darwin",

                "i686-cygwin",

                "i686-freebsd13",

                "x86_64-freebsd13",

                "i686-openbsd",

                "x86_64-openbsd"

            ],

            "position": "/home/user/dev/nixpkgs/pkgs/applications/misc/hello/default.nix:14"

        },

        "name": "hello-2.9",

        "system": "x86_64-linux"

    }

}

```



`nix-env` knows about the `description` field specifically:



```ShellSession

$ nix-env -qa hello --description

hello-2.3  A program that produces a familiar, friendly greeting

```

Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of the package.



## Standard meta-attributes {#sec-standard-meta-attributes}

pkgs/applications/networking/cluster/terraform-providers/providers.json

+2 −2
Original line number Diff line number Diff line
@@ -616,11 +616,11 @@ 
    "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y="

  },

  "keycloak": {

    "hash": "sha256-1yV3w3hhZf113XMxvpRvr3ADaRcuCl7BCIa5SIZPcCs=",

    "hash": "sha256-DW80CkmeQKJ4tEBrLsdks+mXweL8K1pVu3yQKGAvZOs=",

    "homepage": "https://registry.terraform.io/providers/mrparkers/keycloak",

    "owner": "mrparkers",

    "repo": "terraform-provider-keycloak",

    "rev": "v4.0.1",

    "rev": "v4.1.0",

    "spdx": "MIT",

    "vendorHash": "sha256-nDvnLEOtXkUJFY22pKogOzkWrj4qjyQbdlJ5pa/xnK8="

  },

pkgs/applications/networking/instant-messengers/feishu/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -61,13 +61,13 @@ 
}:



stdenv.mkDerivation rec {

  version = "5.14.14";

  version = "5.18.11";

  pname = "feishu";

  packageHash = "2844ab12b34f"; # A hash value used in the download url

  packageHash = "9d89b152d581"; # A hash value used in the download url



  src = fetchurl {

    url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb";

    sha256 = "c0ca999edc10d8ada08c46b33b15d7db0ced264248abd3ebfdb895d8457e1bec";

    hash = "sha256-93LEybYePIEbmE8mjRL95haMuBuY0xH6/8fhwF7/ctM=";

  };



  nativeBuildInputs = [

pkgs/applications/science/logic/coq/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ let 
   "8.15.1".sha256     = "sha256:1janvmnk3czimp0j5qmnfwx6509vhpjc2q7lcza1bc6dm6kn8n42";

   "8.15.2".sha256     = "sha256:0qibbvzrhsvs6w3zpkhyclndp29jnr6bs9i5skjlpp431jdjjfqd";

   "8.16.0".sha256   = "sha256-3V6kL9j2rn5FHBxq1mtmWWTZS9X5cAyvtUsS6DaM+is=";

   "8.16.1".sha256   = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc=";

  };

  releaseRev = v: "V${v}";

  fetched = import ../../../../build-support/coq/meta-fetch/default.nix

pkgs/development/compilers/edk2/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ buildType = if stdenv.isDarwin then 


edk2 = buildStdenv.mkDerivation {

  pname = "edk2";

  version = "202205";

  version = "202211";



  patches = [

    # pass targetPrefix as an env var
@@ -50,7 +50,7 @@ edk2 = buildStdenv.mkDerivation { 
    repo = "edk2";

    rev = "edk2-stable${edk2.version}";

    fetchSubmodules = true;

    sha256 = "sha256-5V3gXZoePxRVL0miV/ku/HILT7d06E8UI28XRx8vZjA=";

    sha256 = "sha256-0jE73xPyenAcgJ1mS35oTc5cYw7jJvVYxhPdhTWpKA0=";

  };



  nativeBuildInputs = [ pythonEnv ];