mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-16 02:33:25 +00:00
Merge pull request #65526 from samueldr/feature/qt-strict-compatible-versions
qt5*: Enforce strict compatible version paths
This commit is contained in:
commit
421782edb1
@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`.
|
||||
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
|
||||
2. From the top of the Nixpkgs tree, run
|
||||
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
|
||||
3. Update `qtCompatVersion` below if the minor version number changes.
|
||||
4. Check that the new packages build correctly.
|
||||
5. Commit the changes and open a pull request.
|
||||
3. Check that the new packages build correctly.
|
||||
4. Commit the changes and open a pull request.
|
||||
|
||||
*/
|
||||
|
||||
@ -32,7 +31,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
qtCompatVersion = "5.11";
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
|
||||
|
||||
|
@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`.
|
||||
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
|
||||
2. From the top of the Nixpkgs tree, run
|
||||
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
|
||||
3. Update `qtCompatVersion` below if the minor version number changes.
|
||||
4. Check that the new packages build correctly.
|
||||
5. Commit the changes and open a pull request.
|
||||
3. Check that the new packages build correctly.
|
||||
4. Commit the changes and open a pull request.
|
||||
|
||||
*/
|
||||
|
||||
@ -32,7 +31,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
qtCompatVersion = "5.12";
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
|
||||
|
||||
|
@ -18,9 +18,8 @@ existing packages here and modify it as necessary.
|
||||
1. Update the URL in `./fetch.sh`.
|
||||
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/`
|
||||
from the top of the Nixpkgs tree.
|
||||
3. Update `qtCompatVersion` below if the minor version number changes.
|
||||
4. Check that the new packages build correctly.
|
||||
5. Commit the changes and open a pull request.
|
||||
3. Check that the new packages build correctly.
|
||||
4. Commit the changes and open a pull request.
|
||||
|
||||
*/
|
||||
|
||||
@ -40,7 +39,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
qtCompatVersion = "5.6";
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
mirror = "http://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||
|
@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`.
|
||||
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
|
||||
2. From the top of the Nixpkgs tree, run
|
||||
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
|
||||
3. Update `qtCompatVersion` below if the minor version number changes.
|
||||
4. Check that the new packages build correctly.
|
||||
5. Commit the changes and open a pull request.
|
||||
3. Check that the new packages build correctly.
|
||||
4. Commit the changes and open a pull request.
|
||||
|
||||
*/
|
||||
|
||||
@ -31,7 +30,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
qtCompatVersion = "5.9";
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
mirror = "http://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
|
||||
|
Loading…
Reference in New Issue
Block a user