Skip to content

Commit cb8eef3

Browse files
committed
Merge branch 'nebula/relicense'
2 parents bc5ba55 + ee01954 commit cb8eef3

3 files changed

Lines changed: 22 additions & 23 deletions

File tree

LICENSE

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
MIT License
1+
Copyright (c) 2025 Flipstone Technology Partners
22

3-
Copyright (c) 2022 Trevis Elser
3+
Permission is hereby granted, free of charge, to any person obtaining
4+
a copy of this software and associated documentation files (the
5+
"Software"), to deal in the Software without restriction, including
6+
without limitation the rights to use, copy, modify, merge, publish,
7+
distribute, sublicense, and/or sell copies of the Software, and to
8+
permit persons to whom the Software is furnished to do so, subject to
9+
the following conditions:
410

5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11+
The above copyright notice and this permission notice shall be included
12+
in all copies or substantial portions of the Software.
1113

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
18+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
19+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
20+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

non-empty-text.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cabal-version: 1.12
44
--
55
-- see: https://github.com/sol/hpack
66
--
7-
-- hash: fec44e5211fe675e5a37ea4993b6ebb7e78ba649413df46f2c5d1a40bbef1073
7+
-- hash: 922653b728a10be452c14cd76c5eed93fbb42a950a1803f0ec379b603d532747
88

99
name: non-empty-text
1010
version: 0.2.1
@@ -14,8 +14,8 @@ description: Typesafe thin wrapper around Data.Text to make impossible to be
1414
category: Data, Text, NonEmpty
1515
homepage: https://github.com/flipstone/haskell-non-empty-text#readme
1616
bug-reports: https://github.com/flipstone/haskell-non-empty-text/issues
17-
author: Antoine Catton, Trevis Elser
18-
maintainer: Trevis Elser <trevis@flipstone.com>
17+
author: Antoine Catton, Trevis Elser, Flipstone Technology Partners
18+
maintainer: maintainers@flipstone.com
1919
license: MIT
2020
license-file: LICENSE
2121
build-type: Simple

package.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ synopsis: Non empty Data.Text type
55
description: |
66
Typesafe thin wrapper around Data.Text to make impossible to be empty (to
77
always hold at least on character)
8-
author: Antoine Catton, Trevis Elser
9-
maintainer: Trevis Elser <trevis@flipstone.com>
8+
author: Antoine Catton, Trevis Elser, Flipstone Technology Partners
9+
maintainer: maintainers@flipstone.com
1010
github: flipstone/haskell-non-empty-text
1111
license: MIT
1212
tested-with:

0 commit comments

Comments
 (0)