diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-10 18:32:07 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-10 18:32:07 +0100 |
| commit | 348eaa280bdc649211dc34a2a79ab3c21db05532 (patch) | |
| tree | c70787b060c878d1cfc487cdb7812db7abb7260e /pkgs/top-level/all-packages.nix | |
| parent | 5ad16cb27fd81cb67db4da80283e147bea4e1c25 (diff) | |
| parent | e2e90a0e6422b143d6d6a9539280eded7306126d (diff) | |
| download | nixpkgs-348eaa280bdc649211dc34a2a79ab3c21db05532.tar nixpkgs-348eaa280bdc649211dc34a2a79ab3c21db05532.tar.gz nixpkgs-348eaa280bdc649211dc34a2a79ab3c21db05532.tar.bz2 nixpkgs-348eaa280bdc649211dc34a2a79ab3c21db05532.tar.lz nixpkgs-348eaa280bdc649211dc34a2a79ab3c21db05532.tar.xz nixpkgs-348eaa280bdc649211dc34a2a79ab3c21db05532.tar.zst nixpkgs-348eaa280bdc649211dc34a2a79ab3c21db05532.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94abb85dfcf..15e7d4fcb51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9409,8 +9409,6 @@ in docSupport = false; yamlSupport = false; fiddleSupport = false; - # remove gcc from runtime closure - removeReferenceToCC = true; }; ruby = ruby_2_6; @@ -10119,12 +10117,7 @@ in java = jdk; }; gradle = res.gradleGen.gradle_latest; - gradle_2_5 = res.gradleGen.gradle_2_5; - gradle_2_14 = res.gradleGen.gradle_2_14; - gradle_3_5 = res.gradleGen.gradle_3_5; gradle_4_10 = res.gradleGen.gradle_4_10; - gradle_2 = gradle_2_14; - gradle_3 = gradle_3_5; gradle_4 = gradle_4_10; gradle_5 = res.gradleGen.gradle_5_6; @@ -18830,7 +18823,7 @@ in FIL-plugins = callPackage ../applications/audio/FIL-plugins { }; - flacon = callPackage ../applications/audio/flacon { }; + flacon = libsForQt5.callPackage ../applications/audio/flacon { }; flexget = callPackage ../applications/networking/flexget { }; |