public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65526 from samueldr/feature/qt-strict-compatible-versions

Browse Source 
qt5*: Enforce strict compatible version paths
This commit is contained in:
Thomas Tuegel 2019-08-02 15:04:04 -05:00 committed by GitHub
commit 421782edb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/5.11/default.nix
View File

@ -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`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run 2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes. 3. Check that the new packages build correctly.
4. Check that the new packages build correctly. 4. Commit the changes and open a pull request.
5. Commit the changes and open a pull request.
*/ */
@ -32,7 +31,7 @@ with stdenv.lib;
let let
qtCompatVersion = "5.11"; qtCompatVersion = srcs.qtbase.version;
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;

7
pkgs/development/libraries/qt-5/5.12/default.nix
View File

@ -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`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run 2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes. 3. Check that the new packages build correctly.
4. Check that the new packages build correctly. 4. Commit the changes and open a pull request.
5. Commit the changes and open a pull request.
*/ */
@ -32,7 +31,7 @@ with stdenv.lib;
let let
qtCompatVersion = "5.12"; qtCompatVersion = srcs.qtbase.version;
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;

7
pkgs/development/libraries/qt-5/5.6/default.nix
View File

@ -18,9 +18,8 @@ existing packages here and modify it as necessary.
1. Update the URL in `./fetch.sh`. 1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/` 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/`
from the top of the Nixpkgs tree. from the top of the Nixpkgs tree.
3. Update `qtCompatVersion` below if the minor version number changes. 3. Check that the new packages build correctly.
4. Check that the new packages build correctly. 4. Commit the changes and open a pull request.
5. Commit the changes and open a pull request.
*/ */
@ -40,7 +39,7 @@ with stdenv.lib;
let let
qtCompatVersion = "5.6"; qtCompatVersion = srcs.qtbase.version;
mirror = "http://download.qt.io"; mirror = "http://download.qt.io";
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };

7
pkgs/development/libraries/qt-5/5.9/default.nix
View File

@ -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`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
2. From the top of the Nixpkgs tree, run 2. From the top of the Nixpkgs tree, run
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
3. Update `qtCompatVersion` below if the minor version number changes. 3. Check that the new packages build correctly.
4. Check that the new packages build correctly. 4. Commit the changes and open a pull request.
5. Commit the changes and open a pull request.
*/ */
@ -31,7 +30,7 @@ with stdenv.lib;
let let
qtCompatVersion = "5.9"; qtCompatVersion = srcs.qtbase.version;
mirror = "http://download.qt.io"; mirror = "http://download.qt.io";
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };