diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-5')
4 files changed, 12 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix index 67c5047e5078..7f0937db30f0 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix @@ -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; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index 1fbf7b57289f..1bc63d0e2b9d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -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; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix index 4f739b57ffec..d45b014b765e 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.6/default.nix @@ -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; }; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix index f36f86e26ffe..52c763263b53 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/5.9/default.nix @@ -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; }; |