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.

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

nginxMainline: 1.15.10 -> 1.15.12 #59950

Merged
merged 1 commit into from Apr 21, 2019

Conversation

@Izorkin
Copy link
Contributor

commented Apr 21, 2019

Motivation for this change

Update nginx to 1.15.12

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Izorkin

This comment has been minimized.

Copy link
Contributor Author

commented Apr 21, 2019

@GrahamcOfBorg build nginxMainline

@c00w

This comment has been minimized.

Copy link
Contributor

commented Apr 21, 2019

I think this should be merged.

  • Commits look good
  • ofborg built and passed it
  • built with nix-review and runs locally
@nixos-discourse

This comment has been minimized.

Copy link

commented Apr 21, 2019

This pull request has been mentioned on Nix community. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/22

@timokau timokau merged commit 5ba8811 into NixOS:master Apr 21, 2019

13 checks passed

grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
nginxMainline on aarch64-linux Success
Details
nginxMainline on x86_64-linux Success
Details

basvandijk added a commit to basvandijk/nixpkgs that referenced this pull request Apr 21, 2019

Support patching nixpkgs
Sometimes you want to track a specific branch of nixpkgs (like
nixpkgs-unstable or some release branch) but you would like to apply some
unmerged pull requests or some other patches to that revision.

Note that overlays are not always sufficient in this case because they don't
work for NixOS modules and you're forced to duplicate code which already
exists in some commit.

In this case you could fork nixpkgs, create a branch based on your desired
upstream branch and cherry-pick the commits you need on top of that
branch. Then everytime you need to upgrade nixpkgs you rebase your branch on
the latest upstream branch that you're tracking. This process works but is a
bit involved and somewhat untransparent.

nixpkgs also supports a simpler and more transparent mechanism to apply some
patches to an existing revision. First you fetch your desired revision of
nixpkgs like for example:

  let
    nixpkgs =
      builtins.fetchTarball {
	url = "https://github.com/NixOS/nixpkgs/archive/86d58407a6bb8ef2e1a58ab50318b149ffd4feda.tar.gz";
	sha256 = "0a2lkvacn78nza9hlmdx9znp1my3c3jf3xyhk9ydw6lxa348b7sl";
      };

Then you import that revision and apply it to a list of patches, for example:

    patchedPkgs = import nixpkgs {
      patches = pkgs : [
	# NixOS#59950
	(pkgs.fetchpatch {
	  url = https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch;
	  sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr";
	})
      ];
    };
  in patchedPkgs...

Note that `patches` should be a function from a nixpkgs set `pkgs` to a list
of patch files that can be applied to a nixpkgs directory tree. The `pkgs` set
should mainly be used to get the `fetchpatch` function from. Note that `pkgs`
is a nixpkgs set for the specified `localSystem` but without `overlays` and
`crossOverlays` defined.

Overlays are applied after patching which means you can have overlays which
can depend on the patched content.

@Izorkin Izorkin deleted the Izorkin:nginxMainline branch Apr 22, 2019

c0bw3b added a commit to c0bw3b/nixpkgs that referenced this pull request Apr 22, 2019

basvandijk added a commit to basvandijk/nixpkgs that referenced this pull request Apr 23, 2019

Support patching nixpkgs
Sometimes you want to track a specific branch of nixpkgs (like
nixpkgs-unstable or some release branch) but you would like to apply some
unmerged pull requests or some other patches to that revision.

Note that overlays are not always sufficient in this case because they don't
work for NixOS modules and you're forced to duplicate code which already
exists in some commit.

In this case you could fork nixpkgs, create a branch based on your desired
upstream branch and cherry-pick the commits you need on top of that
branch. Then everytime you need to upgrade nixpkgs you rebase your branch on
the latest upstream branch that you're tracking. This process works but is a
bit involved and somewhat untransparent.

nixpkgs also supports a simpler and more transparent mechanism to apply some
patches to an existing revision. First you fetch your desired revision of
nixpkgs like for example:

  let
    nixpkgs =
      builtins.fetchTarball {
	url = "https://github.com/NixOS/nixpkgs/archive/86d58407a6bb8ef2e1a58ab50318b149ffd4feda.tar.gz";
	sha256 = "0a2lkvacn78nza9hlmdx9znp1my3c3jf3xyhk9ydw6lxa348b7sl";
      };

Then you import that revision and apply it to a list of patches, for example:

    patchedPkgs = import nixpkgs {
      patches = pkgs : [
	# NixOS#59950
	(pkgs.fetchpatch {
	  url = https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch;
	  sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr";
	})
      ];
    };
  in patchedPkgs...

Note that `patches` should be a function from a nixpkgs set `pkgs` to a list
of patch files that can be applied to a nixpkgs directory tree. The `pkgs` set
should mainly be used to get the `fetchpatch` function from. Note that `pkgs`
is a nixpkgs set for the specified `localSystem` but without `overlays` and
`crossOverlays` defined.

Overlays are applied after patching which means you can have overlays which
can depend on the patched content.

basvandijk added a commit to basvandijk/nixpkgs that referenced this pull request Apr 23, 2019

Support patching nixpkgs
Sometimes you want to track a specific branch of nixpkgs (like
nixpkgs-unstable or some release branch) but you would like to apply some
unmerged pull requests or some other patches to that revision.

Note that overlays are not always sufficient in this case because they don't
work for NixOS modules and you're forced to duplicate code which already
exists in some commit.

In this case you could fork nixpkgs, create a branch based on your desired
upstream branch and cherry-pick the commits you need on top of that
branch. Then everytime you need to upgrade nixpkgs you rebase your branch on
the latest upstream branch that you're tracking. This process works but is a
bit involved and somewhat untransparent.

nixpkgs also supports a simpler and more transparent mechanism to apply some
patches to an existing revision. First you fetch your desired revision of
nixpkgs like for example:

  let
    nixpkgs =
      builtins.fetchTarball {
	url = "https://github.com/NixOS/nixpkgs/archive/86d58407a6bb8ef2e1a58ab50318b149ffd4feda.tar.gz";
	sha256 = "0a2lkvacn78nza9hlmdx9znp1my3c3jf3xyhk9ydw6lxa348b7sl";
      };

Then you import that revision and apply it to a list of patches, for example:

    patchedPkgs = import nixpkgs {
      patches = pkgs : [
	# NixOS#59950
	(pkgs.fetchpatch {
	  url = https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch;
	  sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr";
	})
      ];
    };
  in patchedPkgs...

Note that `patches` should be a function from a nixpkgs set `pkgs` to a list
of patch files that can be applied to a nixpkgs directory tree. The `pkgs` set
should mainly be used to get the `fetchpatch` function from. Note that `pkgs`
is a nixpkgs set for the specified `localSystem` but without `overlays` and
`crossOverlays` defined.

Overlays are applied after patching which means you can have overlays which
can depend on the patched content.

basvandijk added a commit to basvandijk/nixpkgs that referenced this pull request Apr 23, 2019

Support patching nixpkgs
Sometimes you want to track a specific branch of nixpkgs (like
nixpkgs-unstable or some release branch) but you would like to apply some
unmerged pull requests or some other patches to that revision.

Note that overlays are not always sufficient in this case because they don't
work for NixOS modules and you're forced to duplicate code which already
exists in some commit.

In this case you could fork nixpkgs, create a branch based on your desired
upstream branch and cherry-pick the commits you need on top of that
branch. Then everytime you need to upgrade nixpkgs you rebase your branch on
the latest upstream branch that you're tracking. This process works but is a
bit involved and somewhat untransparent.

nixpkgs also supports a simpler and more transparent mechanism to apply some
patches to an existing revision. First you fetch your desired revision of
nixpkgs like for example:

  let
    nixpkgs =
      builtins.fetchTarball {
	url = "https://github.com/NixOS/nixpkgs/archive/86d58407a6bb8ef2e1a58ab50318b149ffd4feda.tar.gz";
	sha256 = "0a2lkvacn78nza9hlmdx9znp1my3c3jf3xyhk9ydw6lxa348b7sl";
      };

Then you import that revision and apply it to a list of patches, for example:

    patchedPkgs = import nixpkgs {
      patches = pkgs : [
	# NixOS#59950
	(pkgs.fetchpatch {
	  url = https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch;
	  sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr";
	})
      ];
    };
  in patchedPkgs...

Note that `patches` should be a function from a nixpkgs set `pkgs` to a list
of patch files that can be applied to a nixpkgs directory tree. The `pkgs` set
should mainly be used to get the `fetchpatch` function from. Note that `pkgs`
is a nixpkgs set for the specified `localSystem` but without `overlays` and
`crossOverlays` defined.

Overlays are applied after patching which means you can have overlays which
can depend on the patched content.

timokau added a commit to timokau/nixpkgs that referenced this pull request May 8, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.