git-annex: 10.20250416 -> 10.20250721

Stackage LTS 24 contains git-annex (contrary to LTS 23). I believe this
resulted in a downgrade of git-annex when switching to LTS 23. We'll
want to continue using the latest version of git-annex. At the very
least, this will fix the trouble we're having with its test suite on
haskell-updates.
This commit is contained in:
sternenseemann
2025-08-29 21:41:14 +02:00
parent 9c4557cf5a
commit bd4a36f924
5 changed files with 6 additions and 278 deletions

View File

@@ -98,6 +98,7 @@ sed -r \
-e '/ ShellCheck /d' \ -e '/ ShellCheck /d' \
-e '/ Agda /d' \ -e '/ Agda /d' \
-e '/ stack /d' \ -e '/ stack /d' \
-e '/ git-annex /d' \
< "${tmpfile_new}" >> $stackage_config < "${tmpfile_new}" >> $stackage_config
# Explanations: # Explanations:
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing. # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.

View File

@@ -610,7 +610,7 @@ with haskellLib;
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "sha256-jaU8bEOo4X5pgolAIjKtsIha/1bYRhI2d2FAcmCs+YI="; sha256 = "sha256-+OjebRbN1IJUnrPH+hpDfMSHtptBF0PkR7M/oAhDGkw=";
# delete android and Android directories which cause issues on # delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them # darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash # during the build process, we can delete it to prevent a hash

View File

@@ -1046,7 +1046,6 @@ default-package-overrides:
- gi-xlib ==2.0.14 - gi-xlib ==2.0.14
- ginger ==0.10.6.0 - ginger ==0.10.6.0
- gio ==0.13.12.0 - gio ==0.13.12.0
- git-annex ==10.20250416
- git-lfs ==1.2.5 - git-lfs ==1.2.5
- git-mediate ==1.1.0 - git-mediate ==1.1.0
- githash ==0.1.7.0 - githash ==0.1.7.0

View File

@@ -1377,7 +1377,6 @@ dont-distribute-packages:
- haskus-web - haskus-web
- haslo - haslo
- hasloGUI - hasloGUI
- hasmtlib
- hasql-postgres - hasql-postgres
- hasql-postgres-options - hasql-postgres-options
- hasql-queue - hasql-queue
@@ -1640,9 +1639,6 @@ dont-distribute-packages:
- hsql-odbc - hsql-odbc
- hsql-postgresql - hsql-postgresql
- hsql-sqlite3 - hsql-sqlite3
- hsqml-datamodel-vinyl
- hsqml-demo-morris
- hsqml-morris
- hsreadability - hsreadability
- hssourceinfo - hssourceinfo
- hssqlppp-th - hssqlppp-th
@@ -2034,14 +2030,6 @@ dont-distribute-packages:
- linnet-conduit - linnet-conduit
- linux-ptrace - linux-ptrace
- lio-eci11 - lio-eci11
- liquid-base
- liquid-bytestring
- liquid-containers
- liquid-ghc-prim
- liquid-parallel
- liquid-platform
- liquid-prelude
- liquid-vector
- liquidhaskell-cabal-demo - liquidhaskell-cabal-demo
- list-t-attoparsec - list-t-attoparsec
- list-t-html-parser - list-t-html-parser
@@ -2096,6 +2084,7 @@ dont-distribute-packages:
- lrucaching-haxl - lrucaching-haxl
- ls-usb - ls-usb
- LslPlus - LslPlus
- lsm-tree
- lsystem - lsystem
- luachunk - luachunk
- lucid-colonnade - lucid-colonnade
@@ -2954,7 +2943,6 @@ dont-distribute-packages:
- rv - rv
- s-expression - s-expression
- S3 - S3
- safe-coupling
- safe-failure - safe-failure
- safe-failure-cme - safe-failure-cme
- safe-plugins - safe-plugins
@@ -2978,6 +2966,7 @@ dont-distribute-packages:
- sandwich-contexts-kubernetes - sandwich-contexts-kubernetes
- sandwich-contexts-minio - sandwich-contexts-minio
- sandwich-webdriver - sandwich-webdriver
- sandwich-webdriver_0_4_0_1
- sarsi - sarsi
- sasha - sasha
- sasl - sasl
@@ -3174,7 +3163,6 @@ dont-distribute-packages:
- smith-client - smith-client
- Smooth - Smooth
- smt - smt
- smtlib-backends-z3
- smtlib2-debug - smtlib2-debug
- smtlib2-pipe - smtlib2-pipe
- smtlib2-quickcheck - smtlib2-quickcheck
@@ -3683,6 +3671,7 @@ dont-distribute-packages:
- WebCont - WebCont
- webcrank-wai - webcrank-wai
- webdriver-w3c - webdriver-w3c
- webdriver_0_13_0_0
- webify - webify
- webserver - webserver
- WEditorBrick - WEditorBrick

View File

@@ -266589,256 +266589,6 @@ self: {
yesod-form, yesod-form,
yesod-static, yesod-static,
}: }:
mkDerivation {
pname = "git-annex";
version = "10.20250416";
sha256 = "02d4dw7mc72y4lb34nhg4lv0wjns9p8hzx80wqbf2vgsyq7q6zk5";
configureFlags = [
"-fassistant"
"-f-benchmark"
"-fcrypton"
"-fdbus"
"-f-debuglocks"
"-fmagicmime"
"-fpairing"
"-fproduction"
"-ftorrentparser"
];
isLibrary = false;
isExecutable = true;
setupHaskellDepends = [
async
base
bytestring
Cabal
directory
exceptions
filepath
filepath-bytestring
process
split
time
utf8-string
];
executableHaskellDepends = [
aeson
ansi-terminal
async
attoparsec
aws
base
blaze-builder
bloomfilter
byteable
bytestring
case-insensitive
clientsession
clock
concurrent-output
conduit
containers
crypto-api
crypton
data-default
DAV
dbus
deepseq
directory
disk-free-space
dlist
edit-distance
exceptions
fdo-notify
feed
file-io
filepath
free
git-lfs
hinotify
http-client
http-client-restricted
http-client-tls
http-conduit
http-types
IfElse
magic
memory
microlens
monad-control
monad-logger
mountpoints
mtl
network
network-bsd
network-info
network-multicast
network-uri
old-locale
optparse-applicative
os-string
path-pieces
persistent
persistent-sqlite
persistent-template
process
QuickCheck
random
regex-tdfa
resourcet
SafeSemaphore
sandi
securemem
servant
servant-client
servant-client-core
servant-server
shakespeare
socks
split
stm
stm-chans
tagsoup
tasty
tasty-hunit
tasty-quickcheck
tasty-rerun
template-haskell
text
time
torrent
transformers
unbounded-delays
unix
unix-compat
unliftio-core
unordered-containers
utf8-string
uuid
vector
wai
wai-extra
warp
warp-tls
yesod
yesod-core
yesod-form
yesod-static
];
description = "manage files with git, without checking their contents into git";
license = lib.licenses.agpl3Only;
mainProgram = "git-annex";
maintainers = [ lib.maintainers.peti ];
}
) { };
"git-annex_10_20250721" = callPackage (
{
mkDerivation,
aeson,
ansi-terminal,
async,
attoparsec,
aws,
base,
blaze-builder,
bloomfilter,
byteable,
bytestring,
Cabal,
case-insensitive,
clientsession,
clock,
concurrent-output,
conduit,
containers,
crypto-api,
crypton,
data-default,
DAV,
dbus,
deepseq,
directory,
disk-free-space,
dlist,
edit-distance,
exceptions,
fdo-notify,
feed,
file-io,
filepath,
filepath-bytestring,
free,
git-lfs,
hinotify,
http-client,
http-client-restricted,
http-client-tls,
http-conduit,
http-types,
IfElse,
magic,
memory,
microlens,
monad-control,
monad-logger,
mountpoints,
mtl,
network,
network-bsd,
network-info,
network-multicast,
network-uri,
old-locale,
optparse-applicative,
os-string,
path-pieces,
persistent,
persistent-sqlite,
persistent-template,
process,
QuickCheck,
random,
regex-tdfa,
resourcet,
SafeSemaphore,
sandi,
securemem,
servant,
servant-client,
servant-client-core,
servant-server,
shakespeare,
socks,
split,
stm,
stm-chans,
tagsoup,
tasty,
tasty-hunit,
tasty-quickcheck,
tasty-rerun,
template-haskell,
text,
time,
torrent,
transformers,
unbounded-delays,
unix,
unix-compat,
unliftio-core,
unordered-containers,
utf8-string,
uuid,
vector,
wai,
wai-extra,
warp,
warp-tls,
yesod,
yesod-core,
yesod-form,
yesod-static,
}:
mkDerivation { mkDerivation {
pname = "git-annex"; pname = "git-annex";
version = "10.20250721"; version = "10.20250721";
@@ -266976,7 +266726,6 @@ self: {
]; ];
description = "manage files with git, without checking their contents into git"; description = "manage files with git, without checking their contents into git";
license = lib.licenses.agpl3Only; license = lib.licenses.agpl3Only;
hydraPlatforms = lib.platforms.none;
mainProgram = "git-annex"; mainProgram = "git-annex";
maintainers = [ lib.maintainers.peti ]; maintainers = [ lib.maintainers.peti ];
} }
@@ -309355,7 +309104,6 @@ self: {
]; ];
description = "A monad for interfacing with external SMT solvers"; description = "A monad for interfacing with external SMT solvers";
license = lib.licenses.gpl3Only; license = lib.licenses.gpl3Only;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -419600,7 +419348,6 @@ self: {
]; ];
description = "base specs for LiquidHaskell"; description = "base specs for LiquidHaskell";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -419632,7 +419379,6 @@ self: {
]; ];
description = "Old specs for the bytestring package"; description = "Old specs for the bytestring package";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -419664,7 +419410,6 @@ self: {
]; ];
description = "Old specs for containers"; description = "Old specs for containers";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -419933,7 +419678,6 @@ self: {
]; ];
description = "Drop-in ghc-prim replacement for LH"; description = "Drop-in ghc-prim replacement for LH";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -419962,7 +419706,6 @@ self: {
]; ];
description = "LiquidHaskell specs for the parallel package"; description = "LiquidHaskell specs for the parallel package";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -419996,7 +419739,6 @@ self: {
]; ];
description = "A battery-included platform for LiquidHaskell"; description = "A battery-included platform for LiquidHaskell";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
mainProgram = "liquidhaskell"; mainProgram = "liquidhaskell";
} }
) { }; ) { };
@@ -420030,7 +419772,6 @@ self: {
]; ];
description = "General utility modules for LiquidHaskell"; description = "General utility modules for LiquidHaskell";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -420059,7 +419800,6 @@ self: {
]; ];
description = "LiquidHaskell specs for the vector package"; description = "LiquidHaskell specs for the vector package";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -427847,6 +427587,7 @@ self: {
doHaddock = false; doHaddock = false;
description = "Log-structured merge-trees"; description = "Log-structured merge-trees";
license = lib.licenses.asl20; license = lib.licenses.asl20;
hydraPlatforms = lib.platforms.none;
} }
) { inherit (pkgs) rocksdb; }; ) { inherit (pkgs) rocksdb; };
@@ -578937,7 +578678,6 @@ self: {
testToolDepends = [ tasty-discover ]; testToolDepends = [ tasty-discover ];
description = "Relational proof system for probabilistic algorithms"; description = "Relational proof system for probabilistic algorithms";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
} }
) { }; ) { };
@@ -615163,7 +614903,6 @@ self: {
]; ];
description = "An SMT-LIB backend implemented using Z3's C API"; description = "An SMT-LIB backend implemented using Z3's C API";
license = lib.licenses.mit; license = lib.licenses.mit;
hydraPlatforms = lib.platforms.none;
} }
) )
{ {