git.iko.soy/typeable/cabal2nix
on master help sign in
fromCabal: use isFreeLicense helper function to determine hydraPlatforms
commit090d7341d27f7e7d5e2f1ebe34b987c71dea8658 authorPeter Simons <simons@cryp.to> dateMon 26 Nov 2018, 17:52 (8 years ago) parent614c022
23 files changed+23−1
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1−1 test/golden-test-cases/ede.nix.golden+1 test/golden-test-cases/gogol-adexchange-buyer.nix.golden+1 test/golden-test-cases/gogol-admin-emailmigration.nix.golden+1 test/golden-test-cases/gogol-affiliates.nix.golden+1 test/golden-test-cases/gogol-apps-tasks.nix.golden+1 test/golden-test-cases/gogol-appstate.nix.golden+1 test/golden-test-cases/gogol-blogger.nix.golden+1 test/golden-test-cases/gogol-datastore.nix.golden+1 test/golden-test-cases/gogol-dfareporting.nix.golden+1 test/golden-test-cases/gogol-firebase-rules.nix.golden+1 test/golden-test-cases/gogol-gmail.nix.golden+1 test/golden-test-cases/gogol-kgsearch.nix.golden+1 test/golden-test-cases/gogol-maps-engine.nix.golden+1 test/golden-test-cases/gogol-plus.nix.golden+1 test/golden-test-cases/gogol-resourceviews.nix.golden+1 test/golden-test-cases/gogol-translate.nix.golden+1 test/golden-test-cases/gogol-webmaster-tools.nix.golden+1 test/golden-test-cases/gogol-youtube.nix.golden+1 test/golden-test-cases/hxt-expat.nix.golden+1 test/golden-test-cases/hxt-tagsoup.nix.golden+1 test/golden-test-cases/openpgp-asciiarmor.nix.golden+1 test/golden-test-cases/swagger.nix.golden+1
src/Distribution/Nixpkgs/Haskell/FromCabal.hs+1−1
@@ -107,7 +107,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
107107 & Nix.description .~ synopsis
108108 & Nix.license .~ nixLicense
109109 & Nix.platforms .~ Nix.allKnownPlatforms
110− & Nix.hydraPlatforms .~ (if nixLicense == Nix.Known "stdenv.lib.licenses.unfree" then Set.empty else Nix.allKnownPlatforms)
110+ & Nix.hydraPlatforms .~ (if isFreeLicense nixLicense then Nix.allKnownPlatforms else Set.empty)
111111 & Nix.maintainers .~ mempty
112112 & Nix.broken .~ not (null missingDeps)
113113 )
test/golden-test-cases/ede.nix.golden+1
@@ -21,4 +21,5 @@ mkDerivation {
2121 homepage = "http://github.com/brendanhay/ede";
2222 description = "Templating language with similar syntax and features to Liquid or Jinja2";
2323 license = "unknown";
24+ hydraPlatforms = stdenv.lib.platforms.none;
2425}
test/golden-test-cases/gogol-adexchange-buyer.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Ad Exchange Buyer SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-admin-emailmigration.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Email Migration API v2 SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-affiliates.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Affiliate Network SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-apps-tasks.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Tasks SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-appstate.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google App State SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-blogger.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Blogger SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-datastore.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Cloud Datastore SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-dfareporting.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google DCM/DFA Reporting And Trafficking SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-firebase-rules.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Firebase Rules SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-gmail.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Gmail SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-kgsearch.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Knowledge Graph Search SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-maps-engine.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Maps Engine SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-plus.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google + SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-resourceviews.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Compute Engine Instance Groups SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-translate.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Translate SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-webmaster-tools.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google Search Console SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/gogol-youtube.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "https://github.com/brendanhay/gogol";
88 description = "Google YouTube Data SDK";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/hxt-expat.nix.golden+1
@@ -7,4 +7,5 @@ mkDerivation {
77 homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
88 description = "Expat parser for HXT";
99 license = "unknown";
10+ hydraPlatforms = stdenv.lib.platforms.none;
1011}
test/golden-test-cases/hxt-tagsoup.nix.golden+1
@@ -11,4 +11,5 @@ mkDerivation {
1111 homepage = "https://github.com/UweSchmidt/hxt";
1212 description = "TagSoup parser for HXT";
1313 license = "unknown";
14+ hydraPlatforms = stdenv.lib.platforms.none;
1415}
test/golden-test-cases/openpgp-asciiarmor.nix.golden+1
@@ -15,4 +15,5 @@ mkDerivation {
1515 homepage = "http://floss.scru.org/openpgp-asciiarmor";
1616 description = "OpenPGP (RFC4880) ASCII Armor codec";
1717 license = "unknown";
18+ hydraPlatforms = stdenv.lib.platforms.none;
1819}
test/golden-test-cases/swagger.nix.golden+1
@@ -11,4 +11,5 @@ mkDerivation {
1111 testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
1212 description = "Implementation of swagger data model";
1313 license = "unknown";
14+ hydraPlatforms = stdenv.lib.platforms.none;
1415}