[Git][haskell-team/package-plan][master] unbreak things slightly
Clint Adams
gitlab at salsa.debian.org
Fri Apr 27 01:10:02 BST 2018
Clint Adams pushed to branch master at Debian Haskell Group / package-plan
Commits:
a4d10812 by Clint Adams at 2018-04-26T20:09:48-04:00
unbreak things slightly
- - - - -
6 changed files:
- packages.txt
- patches/binary-tagged/0.1.4.2/no-nats
- patches/happstack-authenticate/2.3.4.7/series → patches/happstack-authenticate/2.3.4.11/series
- patches/happstack-authenticate/2.3.4.7/use-pwstore-fast.patch → patches/happstack-authenticate/2.3.4.11/use-pwstore-fast.patch
- − patches/happstack-authenticate/2.3.4.7/newer-email-validate
- test-packages.pl
Changes:
=====================================
packages.txt
=====================================
--- a/packages.txt
+++ b/packages.txt
@@ -17,7 +17,7 @@ annotated-wl-pprint 0.7.0
ansi-terminal 0.8.0.2 notest
ansi-wl-pprint 0.6.8.2
appar 0.1.4
-arbtt 0.10.0.1 binary notest key
+arbtt 0.10.0.1 binary notest key ignore
argon2 1.3.0.1 notest
arrows 0.4.4.1 key
asn1-encoding 0.9.5
@@ -360,7 +360,7 @@ hdevtools 0.1.6.1 binary
hedgehog 0.5.3
hedgewars-server 0.1 meta key
hedis 0.10.1 key notest
-heist 1.1 notest
+heist 1.1 notest ahead
here 1.2.13
heredoc 0.2.0.0
hex 0.1.2
@@ -633,6 +633,7 @@ persistent 2.8.1
persistent-postgresql 2.8.2.0
persistent-sqlite 2.8.1.2
persistent-template 2.5.4
+pgp-wordlist-0.1.0.2
# phybin 0.3 tille wants this to be added
pid1 0.1.2.0
pipes 4.3.9
=====================================
patches/binary-tagged/0.1.4.2/no-nats
=====================================
--- a/patches/binary-tagged/0.1.4.2/no-nats
+++ b/patches/binary-tagged/0.1.4.2/no-nats
@@ -1,6 +1,6 @@
--- a/binary-tagged.cabal
+++ b/binary-tagged.cabal
-@@ -39,7 +39,6 @@ library
+@@ -39,7 +39,6 @@
, containers >=0.5 && <0.6
, generics-sop >=0.1 && <0.3
, hashable >=1.2 && <1.3
@@ -8,7 +8,7 @@
, scientific >=0.3 && <0.4
, SHA >=1.6 && <1.7
, semigroups >=0.16 && <0.19
-@@ -68,7 +67,6 @@ test-suite binary-tagged-test
+@@ -68,7 +67,6 @@
, containers >=0.5 && <0.6
, generics-sop >=0.1 && <0.3
, hashable >=1.2 && <1.3
@@ -16,7 +16,7 @@
, scientific >=0.3 && <0.4
, SHA >=1.6 && <1.7
, semigroups >=0.16 && <0.19
-@@ -105,7 +103,6 @@ benchmark binary-tagged-bench
+@@ -105,7 +103,6 @@
, containers >=0.5 && <0.6
, generics-sop >=0.1 && <0.3
, hashable >=1.2 && <1.3
=====================================
patches/happstack-authenticate/2.3.4.7/series → patches/happstack-authenticate/2.3.4.11/series
=====================================
--- a/patches/happstack-authenticate/2.3.4.7/series
+++ b/patches/happstack-authenticate/2.3.4.11/series
@@ -1,2 +1 @@
use-pwstore-fast.patch
-newer-email-validate
=====================================
patches/happstack-authenticate/2.3.4.7/use-pwstore-fast.patch → patches/happstack-authenticate/2.3.4.11/use-pwstore-fast.patch
=====================================
--- a/patches/happstack-authenticate/2.3.4.7/use-pwstore-fast.patch
+++ b/patches/happstack-authenticate/2.3.4.11/use-pwstore-fast.patch
@@ -1,11 +1,11 @@
--- a/happstack-authenticate.cabal
+++ b/happstack-authenticate.cabal
-@@ -67,7 +67,7 @@ Library
+@@ -67,7 +67,7 @@
mime-mail >= 0.4 && < 0.5,
mtl >= 2.0 && < 2.3,
- lens >= 4.2 && < 4.16,
+ lens >= 4.2 && < 4.17,
- pwstore-purehaskell == 2.1.*,
+ pwstore-fast,
text >= 0.11 && < 1.3,
- time >= 1.2 && < 1.7,
+ time >= 1.2 && < 1.10,
userid >= 0.1 && < 0.2,
=====================================
patches/happstack-authenticate/2.3.4.7/newer-email-validate deleted
=====================================
--- a/patches/happstack-authenticate/2.3.4.7/newer-email-validate
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/happstack-authenticate.cabal
-+++ b/happstack-authenticate.cabal
-@@ -50,7 +50,7 @@ Library
- bytestring >= 0.9 && < 0.11,
- containers >= 0.4 && < 0.6,
- data-default >= 0.5 && < 0.8,
-- email-validate >= 2.1 && < 2.3,
-+ email-validate >= 2.1 && < 2.4,
- filepath >= 1.3 && < 1.5,
- hsx2hs >= 0.13 && < 0.15,
- jmacro >= 0.6.11 && < 0.7,
=====================================
test-packages.pl
=====================================
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -273,6 +273,9 @@ __END__
print "Reading 01-index.tar...\n";
my $tar = Archive::Tar->new($originaltarpath);
+ print "Removing package.json files...\n";
+ my @allfiles = $tar->get_files();
+ $tar->remove (grep /package\.json$/, @allfiles);
print "Adding additional packages...\n";
for my $cabalfile (<./additional-cabals/*.cabal>) {
unless ($cabalfile =~ m!^./additional-cabals/(.*)-(.*).cabal!) {
@@ -286,8 +289,10 @@ __END__
my $content = read_file($cabalfile);
my $filename = "$package/$version/$package.cabal";
if ($tar->contains_file($filename)) {
+ printf "Replacing %s\n", $filename;
$tar->replace_content($filename, $content);
} else {
+ printf "Adding %s\n", $filename;
$tar->add_data($filename, $content);
}
}
@@ -318,22 +323,21 @@ __END__
next
}
- my ($tarfile) = $tar->get_files($cabalpath);
printf "Patching %s.cabal (version %s)\n", $pkg, $version;
- my $content = $tarfile->get_content();
+ my $content = $tar->get_content($cabalpath);
my $series = read_file($seriesfile);
foreach my $patchfile (split /^/, $series) {
chomp $patchfile;
my $patch;
run ["filterdiff", "-i", "*.cabal",
- "patches/$pkg/$version/$patchfile"], \"", \$patch;
+ "patches/$pkg/$version/$patchfile"], \"", \$patch;
if ($patch) {
$content = patch($content, $patch, STYLE => "Unified");
} else {
#print "Ignoring $patchfile\n";
}
};
- $tarfile->replace_content($content) or die;
+ $tar->replace_content($cabalpath, $content) or die;
$stats{patched}++;
}
print "Writing 00-index.tar...\n";
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/a4d10812d582908cfdd80d565fa3cfc669371c20
---
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/commit/a4d10812d582908cfdd80d565fa3cfc669371c20
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180427/aa50942d/attachment-0001.html>
More information about the Pkg-haskell-commits
mailing list