distribution-nixpkgs 1.3.1 → 1.4.0

raw patch · 3 files changed

+17/−16 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• distribution-nixpkgs.cabal +2/−2
• src/Distribution/Nixpkgs/License.hs +5/−5
• src/Distribution/Nixpkgs/Meta.hs +10/−9

@@ -1,11 +1,11 @@ name:          distribution-nixpkgs-version:       1.3.1+version:       1.4.0 synopsis:      Types and functions to manipulate the Nixpkgs distribution description:   Types and functions to represent, query, and manipulate the Nixpkgs distribution. license:       BSD3 license-file:  LICENSE maintainer:    Peter Simons <simons@cryp.to>-tested-with:   GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.1+tested-with:   GHC == 8.0.2 || == 8.2.2 || == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.3 category:      Distribution, Nix homepage:      https://github.com/peti/distribution-nixpkgs bug-reports:   https://github.com/peti/distribution-nixpkgs/issues

@@ -14,19 +14,19 @@ import Language.Nix.PrettyPrinting  -- | The representation for licenses used in Nix derivations. Known--- licenses are Nix expressions -- such as @stdenv.lib.licenses.bsd3@+-- licenses are Nix expressions -- such as @lib.licenses.bsd3@ -- --, so their exact \"name\" is not generally known, because the path--- to @stdenv@ depends on the context defined in the expression. In+-- to @lib@ depends on the context defined in the expression. In -- Cabal expressions, for example, the BSD3 license would have to be--- referred to as @self.stdenv.lib.licenses.bsd3@. Other expressions,+-- referred to as @self.lib.licenses.bsd3@. Other expressions, -- however, use different paths to the @licenses@ record. Because of tat -- situation, the library cannot provide an abstract data type that -- encompasses all known licenses. Instead, the @License@ type just -- distinguishes references to known and unknown licenses. The -- difference between the two is in the way they are pretty-printed: ----- > > putStrLn (display (Known "stdenv.lib.license.gpl2"))--- > stdenv.lib.license.gpl2+-- > > putStrLn (display (Known "lib.license.gpl2"))+-- > lib.license.gpl2 -- > -- > > putStrLn (display (Unknown (Just "GPL"))) -- > "GPL"

@@ -43,8 +43,8 @@ -- description = "an example package"; -- license = "unknown"; -- platforms = [ "x86_64-linux" ];--- hydraPlatforms = stdenv.lib.platforms.none;--- maintainers = with stdenv.lib.maintainers; [ jane joe ];+-- hydraPlatforms = lib.platforms.none;+-- maintainers = with lib.maintainers; [ jane joe ]; -- broken = true;  data Meta = Meta@@ -69,13 +69,13 @@     , attr "license" $ pPrint _license     , onlyIf (_platforms /= allKnownPlatforms) $ renderPlatforms "platforms" _platforms     , onlyIf (_hydraPlatforms /= _platforms) $ renderPlatforms "hydraPlatforms" _hydraPlatforms-    , setattr "maintainers" (text "with stdenv.lib.maintainers;") (Set.map (view ident) _maintainers)+    , setattr "maintainers" (text "with lib.maintainers;") (Set.map (view ident) _maintainers)     , boolattr "broken" _broken _broken     ]  renderPlatforms :: String -> Set Platform -> Doc renderPlatforms field ps-  | Set.null ps = sep [ text field <+> equals <+> text "stdenv.lib.platforms.none" <> semi ]+  | Set.null ps = sep [ text field <+> equals <+> text "lib.platforms.none" <> semi ]   | otherwise   = sep [ text field <+> equals <+> lbrack                       , nest 2 $ fsep $ map text (toAscList (Set.map fromCabalPlatform ps))                       , rbrack <> semi@@ -94,11 +94,12 @@  allKnownPlatforms :: Set Platform allKnownPlatforms = Set.fromList [ Platform I386 Linux, Platform X86_64 Linux-                                 , Platform X86_64 OSX+                                 , Platform X86_64 OSX, Platform (OtherArch "armv7l") Linux                                  ]  fromCabalPlatform :: Platform -> String-fromCabalPlatform (Platform I386 Linux)   = "\"i686-linux\""-fromCabalPlatform (Platform X86_64 Linux) = "\"x86_64-linux\""-fromCabalPlatform (Platform X86_64 OSX)   = "\"x86_64-darwin\""-fromCabalPlatform p                       = error ("fromCabalPlatform: invalid Nix platform" ++ show p)+fromCabalPlatform (Platform I386 Linux)                 = "\"i686-linux\""+fromCabalPlatform (Platform X86_64 Linux)               = "\"x86_64-linux\""+fromCabalPlatform (Platform X86_64 OSX)                 = "\"x86_64-darwin\""+fromCabalPlatform (Platform (OtherArch "armv7l") Linux) = "\"armv7l-linux\""+fromCabalPlatform p                                     = error ("fromCabalPlatform: invalid Nix platform" ++ show p)