Update URLs

leonschoorl · martijnbastiaan · commit 9d278c2a7749 · 2019-09-05T08:53:56.000+02:00
* clash-prelude.cabal was still pointing to the old clash-prelude repo * use https everywhere where possible * drop "www." from clash-lang.org, it will redirect there anyway
diff --git a/benchmark/clash-benchmark.cabal b/benchmark/clash-benchmark.cabal
@@ -2,7 +2,7 @@ name:                clash-benchmark
 version:             0.1.0
 synopsis:            Criterion based Clash benchmark
 -- description:
-homepage:            http://www.clash-lang.org/
+homepage:            https://clash-lang.org/
 license:             BSD2
 author:              Leon Schoorl
 category:            Testing
diff --git a/benchmark/profiling/prepare/clash-profiling-prepare.cabal b/benchmark/profiling/prepare/clash-profiling-prepare.cabal
@@ -2,7 +2,7 @@ name:                clash-profiling-prepare
 version:             0.1.0
 synopsis:            Runs ghc frontend and prepares input for clash-profile-normalization-run
 -- description:
-homepage:            http://www.clash-lang.org/
+homepage:            https://clash-lang.org/
 license:             BSD2
 author:              Leon Schoorl
 category:            Testing
diff --git a/benchmark/profiling/run/clash-profiling.cabal b/benchmark/profiling/run/clash-profiling.cabal
@@ -2,7 +2,7 @@ name:                clash-profiling
 version:             0.1.0
 synopsis:            A profilable run of the Clash normalization process
 -- description:
-homepage:            http://www.clash-lang.org/
+homepage:            https://clash-lang.org/
 license:             BSD2
 author:              Leon Schoorl
 category:            Testing
diff --git a/clash-cosim/clash-cosim.cabal b/clash-cosim/clash-cosim.cabal
@@ -57,7 +57,8 @@ custom-setup
 
 source-repository head
   type: git
-  location: https://github.com/clash-lang/clash-cosim.git
+  location: https://github.com/clash-lang/clash-compiler.git
+  subdir: clash-cosim
 
 Library
   default-language: Haskell2010
diff --git a/clash-ghc/clash-ghc.cabal b/clash-ghc/clash-ghc.cabal
@@ -29,9 +29,9 @@ Description:
   * Clash Compiler binary using GHC/Haskell as a frontend
   .
   .
-  Prelude library: <http://hackage.haskell.org/package/clash-prelude>
-Homepage:             http://www.clash-lang.org/
-bug-reports:          http://github.com/clash-lang/clash-compiler/issues
+  Prelude library: <https://hackage.haskell.org/package/clash-prelude>
+Homepage:             https://clash-lang.org/
+bug-reports:          https://github.com/clash-lang/clash-compiler/issues
 License:              BSD2
 License-file:         LICENSE
 Author:               The Clash Authors
@@ -54,6 +54,7 @@ Cabal-version:        >=1.10
 source-repository head
   type: git
   location: https://github.com/clash-lang/clash-compiler.git
+  subdir: clash-ghc
 
 flag dynamic
   description:
diff --git a/clash-ghc/src-bin-821/Clash/GHCi/UI.hs b/clash-ghc/src-bin-821/Clash/GHCi/UI.hs
@@ -173,7 +173,7 @@ defaultGhciSettings opts =
 ghciWelcomeMsg :: String
 ghciWelcomeMsg = "CLaSHi, version " ++ Data.Version.showVersion Paths_clash_ghc.version ++
                  " (using clash-lib, version " ++ Data.Version.showVersion clashLibVersion ++
-                 "):\nhttp://www.clash-lang.org/  :? for help"
+                 "):\nhttps://clash-lang.org/  :? for help"
 
 ghciCommands :: IORef ClashOpts -> [Command]
 ghciCommands opts = map mkCmd [
diff --git a/clash-ghc/src-bin-841/Clash/GHCi/UI.hs b/clash-ghc/src-bin-841/Clash/GHCi/UI.hs
@@ -175,7 +175,7 @@ defaultGhciSettings opts =
 ghciWelcomeMsg :: String
 ghciWelcomeMsg = "CLaSHi, version " ++ Data.Version.showVersion Paths_clash_ghc.version ++
                  " (using clash-lib, version " ++ Data.Version.showVersion clashLibVersion ++
-                 "):\nhttp://www.clash-lang.org/  :? for help"
+                 "):\nhttps://clash-lang.org/  :? for help"
 
 ghciCommands :: IORef ClashOpts -> [Command]
 ghciCommands opts = map mkCmd [
diff --git a/clash-ghc/src-bin-861/Clash/GHCi/UI.hs b/clash-ghc/src-bin-861/Clash/GHCi/UI.hs
@@ -181,7 +181,7 @@ defaultGhciSettings opts =
 ghciWelcomeMsg :: String
 ghciWelcomeMsg = "Clashi, version " ++ Data.Version.showVersion Paths_clash_ghc.version ++
                  " (using clash-lib, version " ++ Data.Version.showVersion clashLibVersion ++
-                 "):\nhttp://www.clash-lang.org/  :? for help"
+                 "):\nhttps://clash-lang.org/  :? for help"
 
 ghciCommands :: IORef ClashOpts -> [Command]
 ghciCommands opts = map mkCmd [
diff --git a/clash-ghc/src-bin-881/Clash/GHCi/UI.hs b/clash-ghc/src-bin-881/Clash/GHCi/UI.hs
@@ -184,7 +184,7 @@ defaultGhciSettings opts =
 ghciWelcomeMsg :: String
 ghciWelcomeMsg = "Clashi, version " ++ Data.Version.showVersion Paths_clash_ghc.version ++
                  " (using clash-lib, version " ++ Data.Version.showVersion clashLibVersion ++
-                 "):\nhttp://www.clash-lang.org/  :? for help"
+                 "):\nhttps://clash-lang.org/  :? for help"
 
 ghciCommands :: IORef ClashOpts -> [Command]
 ghciCommands opts = map mkCmd [
diff --git a/clash-lib/clash-lib.cabal b/clash-lib/clash-lib.cabal
@@ -36,14 +36,14 @@ Description:
   .
   Front-ends (for: parsing, typecheck, etc.) are provided by separate packages:
   .
-  * <http://hackage.haskell.org/package/clash-ghc GHC/Haskell Frontend>
+  * <https://hackage.haskell.org/package/clash-ghc GHC/Haskell Frontend>
   .
   * <https://github.com/christiaanb/Idris-dev Idris Frontend>
   .
   .
-  Prelude library: <http://hackage.haskell.org/package/clash-prelude>
-Homepage:             http://www.clash-lang.org/
-bug-reports:          http://github.com/clash-lang/clash-compiler/issues
+  Prelude library: <https://hackage.haskell.org/package/clash-prelude>
+Homepage:             https://clash-lang.org/
+bug-reports:          https://github.com/clash-lang/clash-compiler/issues
 License:              BSD2
 License-file:         LICENSE
 Author:               The Clash Authors
@@ -71,6 +71,7 @@ Cabal-version:        >=1.10
 source-repository head
   type: git
   location: https://github.com/clash-lang/clash-compiler.git
+  subdir: clash-lib
 
 flag debug
    description:
diff --git a/clash-prelude/clash-prelude.cabal b/clash-prelude/clash-prelude.cabal
@@ -41,8 +41,8 @@ Description:
   A preliminary version of a tutorial can be found in "Clash.Tutorial", for a
   general overview of the library you should however check out "Clash.Prelude".
   Some circuit examples can be found in "Clash.Examples".
-Homepage:             http://www.clash-lang.org/
-bug-reports:          http://github.com/clash-lang/clash-prelude/issues
+Homepage:             https://clash-lang.org/
+bug-reports:          https://github.com/clash-lang/clash-compiler/issues
 License:              BSD2
 License-file:         LICENSE
 Author:               The Clash Authors
@@ -64,7 +64,8 @@ Tested-with:          GHC == 8.2.2, GHC == 8.4.4, GHC == 8.6.5, GHC == 8.8.1
 
 source-repository head
   type: git
-  location: https://github.com/clash-lang/clash-prelude.git
+  location: https://github.com/clash-lang/clash-compiler.git
+  subdir: clash-prelude
 
 flag super-strict
   description:
diff --git a/clash-prelude/src/Clash/Examples.hs b/clash-prelude/src/Clash/Examples.hs
@@ -2,7 +2,7 @@
 Copyright : © 2015-2016, Christiaan Baaij,
               2017     , Google Inc.
               2019     , Myrtle Software Ltd
-Licence   : Creative Commons 4.0 (CC BY 4.0) (http://creativecommons.org/licenses/by/4.0/)
+Licence   : Creative Commons 4.0 (CC BY 4.0) (https://creativecommons.org/licenses/by/4.0/)
 -}
 
 {-# LANGUAGE NoImplicitPrelude, CPP, TemplateHaskell, DataKinds, BinaryLiterals,
diff --git a/clash-prelude/src/Clash/Signal/Internal.hs b/clash-prelude/src/Clash/Signal/Internal.hs
@@ -695,7 +695,7 @@ Signal's ap, i.e (Applicative.<*>), must be lazy in it's second argument:
 > appSignal (f :- fs) ~(a :- as) = f a :- appSignal fs as
 
 because some feedback loops, such as the loop described in 'system' in the
-example at http://hackage.haskell.org/package/clash-prelude-0.10.10/docs/Clash-Prelude-BlockRam.html,
+example at https://hackage.haskell.org/package/clash-prelude-1.0.0/docs/Clash-Prelude-BlockRam.html,
 will lead to "Exception <<loop>>".
 
 However, this "naive" lazy version is _too_ lazy and induces spaceleaks.
diff --git a/clash-prelude/src/Clash/Tutorial.hs b/clash-prelude/src/Clash/Tutorial.hs
@@ -2,7 +2,7 @@
 Copyright : © 2014-2016, Christiaan Baaij,
               2017-2019, Myrtle Software Ltd
               2017     , QBayLogic, Google Inc.
-Licence   : Creative Commons 4.0 (CC BY 4.0) (http://creativecommons.org/licenses/by/4.0/)
+Licence   : Creative Commons 4.0 (CC BY 4.0) (https://creativecommons.org/licenses/by/4.0/)
 -}
 
 {-# LANGUAGE NoImplicitPrelude, MagicHash #-}
diff --git a/clash-term/clash-term.cabal b/clash-term/clash-term.cabal
@@ -2,8 +2,8 @@ Name:                 clash-term
 Version:              1.1.0
 Synopsis:             CAES Language for Synchronous Hardware
 Description:          Terminal-based inspection mechanism for optimization phases.
-Homepage:             http://www.clash-lang.org/
-bug-reports:          http://github.com/clash-lang/clash-compiler/issues
+Homepage:             https://clash-lang.org/
+bug-reports:          https://github.com/clash-lang/clash-compiler/issues
 License:              BSD2
 License-file:         LICENSE
 Author:               Orestis Melkonian
@@ -20,6 +20,7 @@ Cabal-version:        >=1.10
 source-repository head
   type: git
   location: https://github.com/clash-lang/clash-compiler.git
+  subdir: clash-term
 
 executable clash-term
   Main-Is:            Main.hs
diff --git a/testsuite/clash-testsuite.cabal b/testsuite/clash-testsuite.cabal
@@ -1,11 +1,11 @@
 -- Initial clash-testsuite.cabal generated by cabal init.  For further
--- documentation, see http://haskell.org/cabal/users-guide/
+-- documentation, see https://haskell.org/cabal/users-guide/
 
 name:                clash-testsuite
 version:             0.1.0.0
 synopsis:            Clash Testsuite
 -- description:
-homepage:            http://www.clash-lang.org/
+homepage:            https://clash-lang.org/
 license:             BSD2
 license-file:        LICENSE
 author:              Christiaan Baaij

Original file line number	Diff line number	Diff line change
`@@ -36,14 +36,14 @@ Description:`
`36`	`36`	`.`
`37`	`37`	`Front-ends (for: parsing, typecheck, etc.) are provided by separate packages:`
`38`	`38`	`.`
`39`		`- * <http://hackage.haskell.org/package/clash-ghc GHC/Haskell Frontend>`
	`39`	`+ * <https://hackage.haskell.org/package/clash-ghc GHC/Haskell Frontend>`
`40`	`40`	`.`
`41`	`41`	`* <https://github.com/christiaanb/Idris-dev Idris Frontend>`
`42`	`42`	`.`
`43`	`43`	`.`
`44`		`- Prelude library: <http://hackage.haskell.org/package/clash-prelude>`
`45`		`-Homepage: http://www.clash-lang.org/`
`46`		`-bug-reports: http://github.com/clash-lang/clash-compiler/issues`
	`44`	`+ Prelude library: <https://hackage.haskell.org/package/clash-prelude>`
	`45`	`+Homepage: https://clash-lang.org/`
	`46`	`+bug-reports: https://github.com/clash-lang/clash-compiler/issues`
`47`	`47`	`License: BSD2`
`48`	`48`	`License-file: LICENSE`
`49`	`49`	`Author: The Clash Authors`
`@@ -71,6 +71,7 @@ Cabal-version: >=1.10`
`71`	`71`	`source-repository head`
`72`	`72`	`type: git`
`73`	`73`	`location: https://github.com/clash-lang/clash-compiler.git`
	`74`	`+ subdir: clash-lib`
`74`	`75`
`75`	`76`	`flag debug`
`76`	`77`	`description:`