From 99454b6f77a9b8f47b3fcb7c21243658ee986cbc Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 7 Jun 2021 09:29:21 +0200 Subject: [PATCH 01/33] nixos/geoipupdate: Fix config filename copy-paste fail --- nixos/modules/services/misc/geoipupdate.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix index 5d87be928d98..5f843979e984 100644 --- a/nixos/modules/services/misc/geoipupdate.nix +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -119,7 +119,7 @@ in }; }; - geoipupdateConf = pkgs.writeText "discourse.conf" (geoipupdateKeyValue cfg.settings); + geoipupdateConf = pkgs.writeText "geoipupdate.conf" (geoipupdateKeyValue cfg.settings); script = '' mkdir -p "${cfg.settings.DatabaseDirectory}" From 7cf55d1f4edba3e907dcff5958be4dc0bda0897d Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 7 Jun 2021 09:44:05 +0200 Subject: [PATCH 02/33] nixos/geoipupdate: Add myself to maintainers --- nixos/modules/services/misc/geoipupdate.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix index 5f843979e984..836802e3830a 100644 --- a/nixos/modules/services/misc/geoipupdate.nix +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -142,4 +142,6 @@ in }; }; }; + + meta.maintainers = [ lib.maintainers.talyz ]; } From ba4d2bd03c0b30c888876f8b80bb5e42747d09de Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 7 Jun 2021 13:01:49 +0200 Subject: [PATCH 03/33] nixos/geoipupdate: Create database directory in a separate unit The database directory needs to be created before the geoipupdate.service unit is activated; otherwise, systemd will not be able to set up the mount namespacing to grant the service read-write access. --- nixos/modules/services/misc/geoipupdate.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix index 836802e3830a..3cf8e5e1099f 100644 --- a/nixos/modules/services/misc/geoipupdate.nix +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -99,9 +99,22 @@ in LockFile = "/run/geoipupdate/.lock"; }; + systemd.services.geoipupdate-create-db-dir = { + serviceConfig.Type = "oneshot"; + script = '' + mkdir -p ${cfg.settings.DatabaseDirectory} + chmod 0755 ${cfg.settings.DatabaseDirectory} + ''; + }; + systemd.services.geoipupdate = { description = "GeoIP Updater"; - after = [ "network-online.target" "nss-lookup.target" ]; + requires = [ "geoipupdate-create-db-dir.service" ]; + after = [ + "geoipupdate-create-db-dir.service" + "network-online.target" + "nss-lookup.target" + ]; wants = [ "network-online.target" ]; startAt = cfg.interval; serviceConfig = { @@ -122,8 +135,6 @@ in geoipupdateConf = pkgs.writeText "geoipupdate.conf" (geoipupdateKeyValue cfg.settings); script = '' - mkdir -p "${cfg.settings.DatabaseDirectory}" - chmod 755 "${cfg.settings.DatabaseDirectory}" chown geoip "${cfg.settings.DatabaseDirectory}" cp ${geoipupdateConf} /run/geoipupdate/GeoIP.conf From 41c82cd57033ce8122899b8cf96dc824c7ce7e8d Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 7 Jun 2021 13:08:59 +0200 Subject: [PATCH 04/33] nixos/geoipupdate: Run the service right away one time We don't want to have to wait for the timer to expire for the updater to make its first run. This adds a timer unit which triggers the geoipupdate.service unit immediately, but only runs if the configured DatabaseDirectory doesn't exist yet. --- nixos/modules/services/misc/geoipupdate.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix index 3cf8e5e1099f..15d6051fce56 100644 --- a/nixos/modules/services/misc/geoipupdate.nix +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -152,6 +152,15 @@ in RuntimeDirectoryMode = 0700; }; }; + + systemd.timers.geoipupdate-initial-run = { + wantedBy = [ "timers.target" ]; + unitConfig.ConditionPathExists = "!${cfg.settings.DatabaseDirectory}"; + timerConfig = { + Unit = "geoipupdate.service"; + OnActiveSec = 0; + }; + }; }; meta.maintainers = [ lib.maintainers.talyz ]; From 7cc39b13b00dd8ce5eebc5a1cb53e3de22dc9b99 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 7 Jun 2021 13:14:44 +0200 Subject: [PATCH 05/33] nixos/geoipupdate: Add stricter service security --- nixos/modules/services/misc/geoipupdate.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nixos/modules/services/misc/geoipupdate.nix b/nixos/modules/services/misc/geoipupdate.nix index 15d6051fce56..3211d4d88e4d 100644 --- a/nixos/modules/services/misc/geoipupdate.nix +++ b/nixos/modules/services/misc/geoipupdate.nix @@ -150,6 +150,26 @@ in ReadWritePaths = cfg.settings.DatabaseDirectory; RuntimeDirectory = "geoipupdate"; RuntimeDirectoryMode = 0700; + CapabilityBoundingSet = ""; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + RestrictNamespaces = true; + MemoryDenyWriteExecute = true; + LockPersonality = true; + SystemCallArchitectures = "native"; }; }; From 5e0c55b5818f5ade85536dc6e9661f4ad545e4ca Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 21 Jun 2021 14:05:57 +0200 Subject: [PATCH 06/33] haskell-generic-builder: pass pname and version as is This is a full set rebuild, however it improves the name generation for the static and cross case since the respective additional components are now inserted between pname and version instead of after name like before. This prevents builtins.parseDrvName from mistaking a platform config string for a version component. --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b2f23e20eaf..bc0d09589022 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -289,7 +289,7 @@ in lib.fix (drv: assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ - name = "${pname}-${version}"; + inherit pname version; outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") From b0f0b5c6c021ebafbd322899aa9a54b87d75a313 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 23:35:14 +0200 Subject: [PATCH 07/33] all-cabal-hashes: 2021-06-22T07:13:30Z -> 2021-06-22T21:14:17Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 8a8cfa74d702..abcc8a3b4215 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8005ce7c7ba90fa92db65f86c544623353a96cf8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8005ce7c7ba90fa92db65f86c544623353a96cf8.tar.gz", - "sha256": "1kzhh7h0csb0vh9avbjsm6hziaa3lbpmzp4pkij4s3bbl4l664aa", - "msg": "Update from Hackage at 2021-06-22T07:13:30Z" + "commit": "7575a8b1fe6db99da6525563957514c19186fdc6", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7575a8b1fe6db99da6525563957514c19186fdc6.tar.gz", + "sha256": "1pc7lz2h5c4nkky5bf00hra443kk482gw3x09hzlf4s3178mq77f", + "msg": "Update from Hackage at 2021-06-22T21:14:17Z" } From 33c6c74d09e5a0988e9eced28e2742343d999b48 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 23:36:48 +0200 Subject: [PATCH 08/33] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 100 +++++++++++++++--- 1 file changed, 86 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 87864a11e56a..5f7c112a6d7a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -69699,6 +69699,18 @@ self: { license = lib.licenses.mit; }) {}; + "data-lens-light_0_1_2_3" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "data-lens-light"; + version = "0.1.2.3"; + sha256 = "1xczbmgin315qh9wpl6v2vvnp6hv1irfbfqs7pk034qcpx61fwdl"; + libraryHaskellDepends = [ base mtl template-haskell ]; + description = "Simple lenses, minimum dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-lens-template" = callPackage ({ mkDerivation, base, data-lens, template-haskell }: mkDerivation { @@ -88678,8 +88690,8 @@ self: { }: mkDerivation { pname = "fakedata-quickcheck"; - version = "0.1.0"; - sha256 = "0al5brin9bs0553rrw073za4jzw2whrf05yj6h34lmx4kxzciv6s"; + version = "0.2.0"; + sha256 = "0m70r66vbkgi1d016cpgahaas17hysabp44nigz4cda9l3x6qmh6"; libraryHaskellDepends = [ base fakedata QuickCheck random ]; testHaskellDepends = [ base fakedata hspec hspec-core QuickCheck random regex-tdfa text @@ -153778,8 +153790,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.3"; - sha256 = "00774gby970jxa69zw8baki40r6nw7vrprc670n8skmlp03p38j2"; + version = "0.5.4"; + sha256 = "10lmx9xwikk4sbc3ffpzqff9qxpphgp2q8w2rdm2iskaa7qi3skn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171134,6 +171146,28 @@ self: { broken = true; }) {}; + "matrix-client" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, doctest + , exceptions, hashable, hspec, http-client, http-client-tls, retry + , SHA, text, time, unordered-containers + }: + mkDerivation { + pname = "matrix-client"; + version = "0.1.0.0"; + sha256 = "10w1q846b4jnyg9yb87d69ixfyhl205ryrib6a53pbk0bx6zn59w"; + libraryHaskellDepends = [ + aeson base base64 bytestring exceptions hashable http-client + http-client-tls retry SHA text time unordered-containers + ]; + testHaskellDepends = [ + aeson base base64 bytestring doctest exceptions hashable hspec + http-client http-client-tls retry SHA text time + unordered-containers + ]; + description = "A matrix client library"; + license = lib.licenses.asl20; + }) {}; + "matrix-lens" = callPackage ({ mkDerivation, base, hedgehog, lens, matrix, tasty , tasty-discover, tasty-hedgehog, tasty-hspec, vector @@ -189008,8 +189042,8 @@ self: { pname = "nvim-hs"; version = "2.1.0.4"; sha256 = "0bg94adja6xvzlv1x849nrfpb0i5mjbp19f9cwhaa4iw1qs532rf"; - revision = "1"; - editedCabalFile = "0yzdq8nxf2n7n4ns6frgl5nhgb3vj3nkh7336mz994iydam17wcl"; + revision = "2"; + editedCabalFile = "0bd90ndkk4lll4rvr87b9vil2h8jlchkh1fag1nrhj90lnczgpnl"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -189033,6 +189067,44 @@ self: { license = lib.licenses.asl20; }) {}; + "nvim-hs_2_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , typed-process, unliftio, unliftio-core, utf8-string, vector, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "2.1.0.5"; + sha256 = "11ld5bgrica3ma54f7x37hcbcl0ms3x6gi0326by3jsnskxplz0z"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base typed-process unliftio unliftio-core utf8-string + vector void + ]; + testHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell plugin backend for neovim"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -196066,8 +196138,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsec1"; - version = "1.0.0.7"; - sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; + version = "1.0.0.8"; + sha256 = "02zagbrn4w6gjl9awh4si5b6ia14p4rx22cssd03zx4ddb8kcwf7"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; license = lib.licenses.bsd3; @@ -203588,8 +203660,8 @@ self: { }: mkDerivation { pname = "ploterific"; - version = "0.2.1.2"; - sha256 = "1ywg09amxngan23c5724c5s2s79yhynqha6c5xivg1ls58nc7yk5"; + version = "0.2.1.3"; + sha256 = "0ggi653hjg9s3v9zqsapm3ryb37hfdbw21pznhsvzhyy3n0fv7jv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223672,8 +223744,8 @@ self: { }: mkDerivation { pname = "rio-process-pool"; - version = "1.0.0"; - sha256 = "09v95wyrsa6yg5q5zaf9gqmn2xhh1i1q2mmxq52xhpc8pqwj93b9"; + version = "1.0.1"; + sha256 = "1r3w7p9yf2k2czdwm739y191x25ravbsn948wwgqxsqamsqs7l18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256206,8 +256278,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.1"; sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; - revision = "1"; - editedCabalFile = "033s0aap50r7y3sbxc1jf60lpv66nljwyypc8smyccgiv5l8khzr"; + revision = "2"; + editedCabalFile = "13f0rmdyfd8wx9w9d6vj40akskq763gjj89p7dzy6zyaiyllgk64"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; From 4d5ef43b9c4bf08c917e29cedc0d0f423dcb8e58 Mon Sep 17 00:00:00 2001 From: Tommy Bidne Date: Fri, 25 Jun 2021 14:02:08 +1200 Subject: [PATCH 09/33] haskellPackages.xmonad-wallpaper: remove jailbreak Removing jailbreak as upstream issue has been fixed: https://github.com/yeyan/xmonad-wallpaper/issues/2 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1c3cbbbbe31f..facd7ab723c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -706,10 +706,6 @@ self: super: { uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # Bypass version check for random < 1.2 (1.2 works fine). - # https://github.com/yeyan/xmonad-wallpaper/issues/2 - xmonad-wallpaper = doJailbreak super.xmonad-wallpaper; - # The tests spuriously fail libmpd = dontCheck super.libmpd; From 841fa25e22792e51ab1cc0486c0b2d457922ea67 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 26 Jun 2021 15:11:22 +0200 Subject: [PATCH 10/33] all-cabal-hashes: 2021-06-22T21:14:17Z -> 2021-06-26T12:56:56Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index abcc8a3b4215..b44bcc923785 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "7575a8b1fe6db99da6525563957514c19186fdc6", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7575a8b1fe6db99da6525563957514c19186fdc6.tar.gz", - "sha256": "1pc7lz2h5c4nkky5bf00hra443kk482gw3x09hzlf4s3178mq77f", - "msg": "Update from Hackage at 2021-06-22T21:14:17Z" + "commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz", + "sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq", + "msg": "Update from Hackage at 2021-06-26T12:56:56Z" } From 3e61745b53d358b6ac2116c4ea5f7ff6a0f36def Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 26 Jun 2021 15:12:53 +0200 Subject: [PATCH 11/33] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 757 +++++++++++++++--- 1 file changed, 637 insertions(+), 120 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5f7c112a6d7a..b23a2304728e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8818,17 +8818,17 @@ self: { ({ mkDerivation, base, constraints, containers, data-default , deepseq, directory, doctest-exitcode-stdio, doctest-lib , exceptions, extra, hspec, monad-control, mono-traversable, mtl - , QuickCheck, regex-tdfa, syb, template-haskell, transformers-base - , unliftio + , QuickCheck, regex-tdfa, stm, syb, template-haskell + , transformers-base, unliftio }: mkDerivation { pname = "HMock"; - version = "0.1.0.1"; - sha256 = "1viv8aggapxvk1akm1z3976h4b12wa8zwkr5qinfpvmsgvlkhhlz"; + version = "0.2.0.0"; + sha256 = "1i5b9fxb5fii3ib97dncr5pfsylj5bsppi45qx7wq1idmz0fq3rj"; libraryHaskellDepends = [ base constraints containers data-default exceptions extra - monad-control mono-traversable mtl regex-tdfa syb template-haskell - transformers-base unliftio + monad-control mono-traversable mtl regex-tdfa stm syb + template-haskell transformers-base unliftio ]; testHaskellDepends = [ base containers data-default deepseq directory @@ -35089,8 +35089,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.5.1"; - sha256 = "1fn28rg79w5kkv3lrmqjcff8fhn1kc2b84vnblr0xqbfdjdbzgp6"; + version = "1.0.5.2"; + sha256 = "05x7xij5jyfzcl0hyjjw4lxlzgkmi55q48s5vbgvba48a2crv0qj"; libraryHaskellDepends = [ attoparsec attoparsec-time base bytestring scientific text time uuid @@ -35234,16 +35234,12 @@ self: { }) {}; "attoparsec-time" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, scientific, text - , time - }: + ({ mkDerivation, attoparsec, base, bytestring, text, time }: mkDerivation { pname = "attoparsec-time"; - version = "1.0.1.1"; - sha256 = "1g3wfc499zdz79i06hgg4286ky9yv4mi3jgq1zf92ik1wcw23q6l"; - libraryHaskellDepends = [ - attoparsec base bytestring scientific text time - ]; + version = "1.0.1.2"; + sha256 = "1pc4dy4d6q11cfmgrg41h2nm34vgnnarah85gnwbd6x48cissrpp"; + libraryHaskellDepends = [ attoparsec base bytestring text time ]; description = "Attoparsec parsers of time"; license = lib.licenses.mit; }) {}; @@ -38232,6 +38228,8 @@ self: { pname = "base32"; version = "0.2.1.0"; sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; + revision = "1"; + editedCabalFile = "0apyphnlsnr16s5xb9b9g7d5aw3ny4qx8nz8y71zpglk63sy0cq0"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -39495,6 +39493,35 @@ self: { broken = true; }) {}; + "bech32_1_1_1" = callPackage + ({ mkDerivation, array, base, base58-bytestring, bytestring + , containers, deepseq, extra, hspec, hspec-discover, memory + , optparse-applicative, process, QuickCheck, text, vector + }: + mkDerivation { + pname = "bech32"; + version = "1.1.1"; + sha256 = "0ibdibki3f51wpxby3cl6p0xzd32ddczlg2dcqxy7lgx7j3h9xgn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers extra text + ]; + executableHaskellDepends = [ + base base58-bytestring bytestring extra memory optparse-applicative + text + ]; + testHaskellDepends = [ + base base58-bytestring bytestring containers deepseq extra hspec + memory process QuickCheck text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bech32-th" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text @@ -39513,6 +39540,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bech32-th_1_1_1" = callPackage + ({ mkDerivation, base, bech32, hspec, hspec-discover + , template-haskell, text + }: + mkDerivation { + pname = "bech32-th"; + version = "1.1.1"; + sha256 = "0548an9v6y14qalb1agl5bskcmpb9865lxyap162xzgskd9s4iik"; + libraryHaskellDepends = [ base bech32 template-haskell text ]; + testHaskellDepends = [ base bech32 hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Template Haskell extensions to the Bech32 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "bed-and-breakfast" = callPackage ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck , template-haskell @@ -44256,8 +44299,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.5.1.1"; - sha256 = "0v3ifwxjbxm86ybn5daqqfdm4nmbfzlbkyc19d4nawnzjyf8v2p9"; + version = "0.6.0.0"; + sha256 = "1rywy6r5wachz3y9vw1iy5b46fvlxcv5s33lrriffimqprkglbcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47353,8 +47396,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.7.0"; - sha256 = "1vckm98sarxzqh6ib89y5kzhbf1yxc9wgrbpwbsrh0dv5gi3pclj"; + version = "0.3.8.0"; + sha256 = "19gg4qjlj595j8zd0n6cz2kgz70g8z6w666c6wlf5lj32j8p6yh5"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -50184,8 +50227,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.30.2"; - sha256 = "0i0v8cb0a3mbkrb3liw60gb7zflnps5w04a6nx5aynini7mpwanj"; + version = "0.1.30.3"; + sha256 = "0r6vrcdqqf6a8rihjgppmp625ws5vmsmq98i177xfg14hsal49pp"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -58667,6 +58710,24 @@ self: { license = lib.licenses.mit; }) {}; + "colour_2_3_6" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.6"; + sha256 = "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + description = "A model for human colour/color perception"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "colour-accelerate" = callPackage ({ mkDerivation, accelerate, base }: mkDerivation { @@ -67215,8 +67276,8 @@ self: { }: mkDerivation { pname = "cuckoo"; - version = "0.2.1"; - sha256 = "1bv39vfg0yzancyya1cdbrcdc0gasp0djcc9ryiwrc3kf9y0nbzn"; + version = "0.2.2"; + sha256 = "1wm81a5fsq0wdvx3ayxfrljya7rm9c0vfmy5dhxa6h9zxnqrkvav"; libraryHaskellDepends = [ base memory primitive random vector ]; testHaskellDepends = [ base bytestring cryptonite doctest hashable memory primitive @@ -73866,6 +73927,8 @@ self: { pname = "dhall-docs"; version = "1.0.6"; sha256 = "004n8kh8riw67aqwp6z9199jwv2c9r1dbkg92s71vd9zc04wxljv"; + revision = "1"; + editedCabalFile = "1m8ms4y4pxiays620k4zjf7hnfk103y990pnhnb6hr0h70n7i157"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74549,6 +74612,8 @@ self: { pname = "diagrams-graphviz"; version = "1.4.1.1"; sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40"; + revision = "1"; + editedCabalFile = "1qx69541pxf71whfz2a913yzbhfcks2pyzfprkgrcmiiyv0a3i7b"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -75632,8 +75697,8 @@ self: { }: mkDerivation { pname = "digraph"; - version = "0.2"; - sha256 = "0k6kr1vr25i2jvv2q1xby06b7xkpg2dr4sq2ffnv0lmznshjy8y5"; + version = "0.2.1"; + sha256 = "04x8y6snlfm8w22l0mn58sqbgdsc3av9l6qz2wqfdjmcp7h7s79r"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -78690,8 +78755,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1.1.1"; - sha256 = "1vy789dv1lpha2bxvr0x1vk2vvgb9z43abkqi1rbj2vvirqsbr1n"; + version = "0.1.1.2"; + sha256 = "0s4x7jhhcx94fzi8cg5bqfqn2vajdlv1yjrakfnfdqk187zbdc6r"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -78699,7 +78764,8 @@ self: { ]; testHaskellDepends = [ base domain-core QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck template-haskell text th-orphans + tasty-hunit tasty-quickcheck template-haskell + template-haskell-compat-v0208 text th-orphans ]; description = "Codegen helping you define domain models"; license = lib.licenses.mit; @@ -85441,7 +85507,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_1_0" = callPackage + "esqueleto_3_5_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -85451,8 +85517,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.1.0"; - sha256 = "1r77lym11gh53059b3hg5wyzb4ymaynk5awrmzgnwfkmx041sqp8"; + version = "3.5.2.0"; + sha256 = "06z5n0nbyrdvzlfqmx3jvh76kkss3bis19k5ppqkifsfgwi07rzw"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -96682,8 +96748,8 @@ self: { }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.11"; - sha256 = "1gi7db5mjq25xwl27ihsrg0ya1jgw5zhki5c1431rizj72yx5ji9"; + version = "0.2.0.13"; + sha256 = "0favv5lfhhhsjasn0gfx2m9q18j8qjk3w92ih78nqaam8gfg59vm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96705,10 +96771,10 @@ self: { ({ mkDerivation, base, bv, containers, multiset, text, vector }: mkDerivation { pname = "funcons-values"; - version = "0.1.0.7"; - sha256 = "0jdgwv44gs4zr8z5pg6lzikrgn3dzna8z0vriq71anlifjyci8yq"; + version = "0.1.0.9"; + sha256 = "1817jhp9vpipkvxdqvn4yj88z7z3pyrxs22h4d51c3056ighq6wn"; revision = "1"; - editedCabalFile = "1aam84wminmcy530vkv8g2qkag6gz45yyx5xks7gq1y7jifm1kkb"; + editedCabalFile = "1g807b4lpz0whz0v4xl7y0qj0682y9lvmng06rxxyabn2lcvx5sc"; libraryHaskellDepends = [ base bv containers multiset text vector ]; @@ -97365,6 +97431,8 @@ self: { pname = "futhark-data"; version = "1.0.0.1"; sha256 = "126b7igrk0aldj4kjwkyvvsy3v64g9iv6w9ladbbfnd4qw7svswm"; + revision = "1"; + editedCabalFile = "08p820dmdlg5x6ikgi69sddkywj71cnnjwz2fppnv901bbn55fav"; libraryHaskellDepends = [ base binary bytestring bytestring-to-vector containers megaparsec mtl text vector vector-binary-instances @@ -104902,6 +104970,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "githash_0_1_6_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, th-compat, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.6.1"; + sha256 = "0g922g2l3xv795gvhri5ccrh751dnyckjs7mzv1d8pg2lffpj0bi"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + th-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary th-compat unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -105278,6 +105367,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, temporary, text, time + , transformers, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.3.0"; + sha256 = "0krcan8i9lkickl77r9dyf93k96yxj5zp0asmzq86ds13m8f3s9i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types temporary + text time transformers unix unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -129658,8 +129767,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.14.3.0"; - sha256 = "113lr6b47fs3900wrn8fg1kxcbvfh91gla7585h13miz3wyjbdyf"; + version = "0.14.4"; + sha256 = "1qvh5vgnk6vrhhr1kjqsycz13acxa7ynpqnd1bmchfl4q3aga9gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139698,8 +139807,8 @@ self: { pname = "html-parse"; version = "0.2.0.2"; sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; - revision = "1"; - editedCabalFile = "1hr9bskwwx3svxqaxcyaz8v0brli1bb03xcvg7zpgbisf8x6r316"; + revision = "2"; + editedCabalFile = "1arck1sfcnqfczpi6zq4rja3svd3vcxxdi69dv9983v3sl01hk2g"; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -144414,8 +144523,8 @@ self: { }: mkDerivation { pname = "hypertypes"; - version = "0.1.0.1"; - sha256 = "0b3cnjw07pryqslnx0k6lxdpwnihnk6pnhp6l9d09mqyxymd9nyx"; + version = "0.1.0.2"; + sha256 = "1zh10884a2fvj06ndh4hz2vk97x4nibr57b30kgq731x4q50zgfs"; libraryHaskellDepends = [ array base base-compat binary constraints containers deepseq generic-constraints generic-data lattices lens monad-st mtl pretty @@ -149411,8 +149520,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.2.1"; - sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0"; + version = "8.3.1"; + sha256 = "01sdx0j0rm7rgylac51mk4ph5krdnzdd8532di5g5ik3p112dzg8"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; license = lib.licenses.mit; @@ -156133,8 +156242,8 @@ self: { }: mkDerivation { pname = "knit"; - version = "0.2.0.0"; - sha256 = "0a1swv5w9fxissxqr2x61qijqyhdxs71fv21fjz4r0kcqywnvy6x"; + version = "0.3.0.0"; + sha256 = "0wp16yrlibfl32b4akcwali074wxar96mvaykgh0xsf4pq1czx3q"; libraryHaskellDepends = [ base bytestring containers deepseq hashtables vector ]; @@ -164953,6 +165062,31 @@ self: { license = lib.licenses.mit; }) {}; + "literatex_0_2_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit + , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc + , unliftio + }: + mkDerivation { + pname = "literatex"; + version = "0.2.0.0"; + sha256 = "1j5x1hfh71jpywgwpbyir74h58b6lzaj7gpk2f07xlcwqmm68syz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit text ttc unliftio + ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative ttc + ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit text ttc unliftio + ]; + description = "transform literate source code to Markdown"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "little-earley" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -166076,8 +166210,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.0.0"; - sha256 = "05cvk93s61k42bmsmj4997hdij4xk74a6jrd1qvdbkq13w20260m"; + version = "0.12.1.0"; + sha256 = "07z0p5jcd5gjhk4dyf9ny74l68ja58ffa80mbfsyaz66ff6k4y6s"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -172937,16 +173071,14 @@ self: { }) {}; "merkle-log" = callPackage - ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite - , deepseq, exceptions, hash-tree, memory, merkle-tree, mwc-random - , QuickCheck, random, random-bytestring, text + ({ mkDerivation, base, bytestring, criterion, cryptonite, deepseq + , exceptions, hash-tree, memory, mwc-random, QuickCheck, random + , random-bytestring, text }: mkDerivation { pname = "merkle-log"; - version = "0.1.0.0"; - sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia"; - revision = "1"; - editedCabalFile = "1vrzsflvmx0mrsdb7i7pbz4d74k6yjccrb7979yw0r91qhmzlcir"; + version = "0.1.1"; + sha256 = "17a6s9xbv460289avbwdnf8c4vhw9qzj5xddxvfmnjjwp58qxvj1"; libraryHaskellDepends = [ base bytestring cryptonite deepseq exceptions memory text ]; @@ -172954,8 +173086,8 @@ self: { base bytestring cryptonite deepseq exceptions memory QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring cereal criterion cryptonite deepseq hash-tree - memory merkle-tree mwc-random QuickCheck random random-bytestring + base bytestring criterion cryptonite deepseq hash-tree memory + mwc-random QuickCheck random random-bytestring ]; description = "Merkle Tree Logs"; license = lib.licenses.bsd3; @@ -173628,31 +173760,33 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base - , base-compat, blaze-html, blaze-markup, bytestring, containers - , data-default, either, errors, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, tagsoup, template-haskell, text, time, transformers - , unordered-containers, vector, wai-cli, wai-extra, xml-lens - , xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec + , aws-lambda-haskell-runtime, aws-lambda-haskell-runtime-wai, base + , base-compat, blaze-html, blaze-markup, bytestring + , case-insensitive, containers, data-default, either, errors + , githash, hspec, hspec-expectations-pretty-diff, html-conduit + , lens, lens-aeson, mtl, network, network-uri, options, pcre-heavy + , raw-strings-qq, safe, scotty, tagsoup, template-haskell, text + , time, transformers, unordered-containers, vector, wai, wai-cli + , wai-extra, xml-lens, xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.9"; - sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish"; + version = "1.0.2.0"; + sha256 = "1vrw60az8jb3m9kk2vsn1v5l68jmwxsfw3p7lfwl9a8d4gk5m1gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-qq attoparsec base base-compat blaze-markup bytestring - containers data-default either errors html-conduit lens-aeson - network-uri pcre-heavy safe tagsoup text time transformers - unordered-containers vector xml-lens xss-sanitize + case-insensitive containers data-default either errors html-conduit + lens lens-aeson network-uri pcre-heavy safe tagsoup text time + transformers unordered-containers vector xml-lens xss-sanitize ]; executableHaskellDepends = [ - aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty text wai-cli - wai-extra + aeson aeson-pretty aws-lambda-haskell-runtime + aws-lambda-haskell-runtime-wai base base-compat blaze-html + blaze-markup data-default githash network network-uri options + scotty text wai wai-cli wai-extra ]; testHaskellDepends = [ aeson-qq base base-compat bytestring data-default hspec @@ -192537,12 +192671,12 @@ self: { }) {}; "optparse-declarative" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, exceptions, mtl }: mkDerivation { pname = "optparse-declarative"; - version = "0.4.1"; - sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr"; - libraryHaskellDepends = [ base mtl ]; + version = "0.4.2"; + sha256 = "0a8b4aa5zvj36nj81kfylxcqfp9ahi5lnak61wvwv9bw68r2a2jn"; + libraryHaskellDepends = [ base exceptions mtl ]; description = "Declarative command line option parser"; license = lib.licenses.mit; }) {}; @@ -192613,6 +192747,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1_4" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, th-compat, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1.4"; + sha256 = "0y3qgab8csiwyv60cnpzpv65n3c0ikvdx5b5mfkfahkv8xfdh08x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell th-compat + transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -194258,6 +194412,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_14_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix + , unordered-containers, xml, xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.14.0.3"; + sha256 = "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix unordered-containers xml + xml-conduit zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -199074,7 +199287,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_13_0_3" = callPackage + "persistent_2_13_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -199085,8 +199298,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.0.3"; - sha256 = "0jlrkyy10cz6rq47r75q9l5ycyrdjwxs810x7v5ijrimdd9cv24d"; + version = "2.13.0.4"; + sha256 = "04q4x50p2jpsp7fzrb61rs225hnrl8n1khmdvf0z6inkwq462w6a"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -204955,6 +205168,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-readline" = callPackage + ({ mkDerivation, base, exceptions, haskeline, polysemy + , polysemy-plugin + }: + mkDerivation { + pname = "polysemy-readline"; + version = "0.1.0.0"; + sha256 = "19nic0n5k3r5qbmhnrzwrkncj61ba43qmg86mx0y190mvx540yz1"; + libraryHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + description = "Readline effect for polysemy"; + license = lib.licenses.bsd2; + }) {}; + "polysemy-resume" = callPackage ({ mkDerivation, base, hedgehog, polysemy, polysemy-plugin , polysemy-test, relude, tasty, tasty-hedgehog, text, transformers @@ -216699,24 +216930,24 @@ self: { , filepath, hashable, html-entities, http-conduit, HUnit , lifted-base, mmorph, mtl, network-uri, parsec, parsers , QuickCheck, safe, selective, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, xeno + , template-haskell, temporary, text, unordered-containers, xeno }: mkDerivation { pname = "rdf4h"; - version = "4.0.2"; - sha256 = "1gkz1i1v2509aa5c9jp2lgmsnnsr7d1314gq3xmcs21dfgf7xibw"; + version = "5.0.1"; + sha256 = "0i6sza600fzrk92pp9qc4ji361js5adg7ijf30hb9fdl854hjgk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs attoparsec base binary bytestring containers deepseq exceptions filepath hashable html-entities http-conduit - lifted-base mmorph mtl network-uri parsec parsers selective text - unordered-containers xeno + lifted-base mmorph mtl network-uri parsec parsers selective + template-haskell text unordered-containers xeno ]; executableHaskellDepends = [ base containers text ]; testHaskellDepends = [ - base containers directory filepath HUnit QuickCheck safe tasty - tasty-hunit tasty-quickcheck text + base bytestring containers directory filepath HUnit QuickCheck safe + tasty tasty-hunit tasty-quickcheck temporary text ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A library for RDF processing in Haskell"; @@ -231626,14 +231857,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant_0_18_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors + , bytestring, case-insensitive, deepseq, hspec, hspec-discover + , http-api-data, http-media, http-types, mmorph, mtl, network-uri + , QuickCheck, quickcheck-instances, singleton-bool, sop-core + , string-conversions, tagged, text, transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.18.3"; + sha256 = "033ykm8l7a9bjcwb3v9d0ljglq1sxpjm1iss7nqakpyxljcg2sxp"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bifunctors bytestring + case-insensitive deepseq http-api-data http-media http-types mmorph + mtl network-uri QuickCheck singleton-bool sop-core + string-conversions tagged text transformers vault + ]; + testHaskellDepends = [ + aeson base base-compat bytestring hspec http-media mtl QuickCheck + quickcheck-instances string-conversions text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.6"; - sha256 = "16bdlgrz71h03lr2xcd2isclfzgr9h2xdl5lbnbs0v1czaxx7m6h"; + version = "0.3.1.0"; + sha256 = "1mi9b84myy3sg35xxrna5pwjwkn51v0xsd300ssvy8xaj4k96wjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231683,8 +231941,8 @@ self: { pname = "servant-auth"; version = "0.4.0.0"; sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; - revision = "2"; - editedCabalFile = "0mbx44l1jnvfvppv6diiixqx5rdkb68djxl36m5sd12qz6rqmcx0"; + revision = "3"; + editedCabalFile = "1hq0mz4fm2f6v57jzyahk5wfip285v3yh20dawvmwdh7wq6104zr"; libraryHaskellDepends = [ aeson base jose lens servant text unordered-containers ]; @@ -231703,8 +231961,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.0"; sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83"; - revision = "1"; - editedCabalFile = "0q7bazq4ilijclpz23fshpjcspnrfalh7jhqi5gg03m00wwibn4n"; + revision = "2"; + editedCabalFile = "0mq9nhrlh44jxkngj06pasrrjzv5193lj6d2szprnncgrk36zi31"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -231759,8 +232017,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "7"; - editedCabalFile = "10178ahxq36l9mik7dcn1c1f97fpp8b4r7xiqwiv21llp95s7cqp"; + revision = "8"; + editedCabalFile = "01mb003lajxs1x82k20dbnxzdvxdla51vi4dh4f0a1xycvyhfpyi"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -231825,8 +232083,8 @@ self: { pname = "servant-auth-server"; version = "0.4.6.0"; sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; - revision = "2"; - editedCabalFile = "1vf0mnbq0wmwha3aa2fn593dwibaw00l4agspgvchx7574jyr5wp"; + revision = "3"; + editedCabalFile = "0iasfns12wab45hf4qkwm5bx1z63ass9n5sh926wnn82g1v6qdyw"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -231851,8 +232109,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; - revision = "2"; - editedCabalFile = "0b8fawx2wv9zshn9i4abnwy4lgf3fkhbhm8bhfpgm9d867dx21y4"; + revision = "3"; + editedCabalFile = "1hkszdp7c7c34b2yp2gb7khzlzq8iw5ma066r30kq2nw5jj895k0"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -232184,6 +232442,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, sop-core, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.18.3"; + sha256 = "0ddn7x9z2znkkyn6l2x6a85vq673q4vppr0q9n56ibvl3k3saxj0"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server + sop-core stm tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec @@ -232207,6 +232496,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client-core_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, deepseq, exceptions, free, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , safe, servant, sop-core, template-haskell, text, transformers + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.18.3"; + sha256 = "1iln4axymmmk3ib0wxmpzjgq16lip8nz7xich3ysgzx6g2n15xsd"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring containers + deepseq exceptions free http-media http-types network-uri safe + servant sop-core template-haskell text transformers + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-js" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, exceptions, http-media, http-types, jsaddle @@ -232259,6 +232570,8 @@ self: { pname = "servant-conduit"; version = "0.15.1"; sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp"; + revision = "1"; + editedCabalFile = "0j7jrwyj6vnfr8wyyzjjm6gakx401aylrq8shc2y9ciy0mhf8lrv"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -232382,6 +232695,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-docs_0_11_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.11.9"; + sha256 = "0ynjyyxlzb2j5d92rryqqa97rp16582mbmvnv7syczha5ziq24nk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-docs-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec , hspec-core, ordered-containers, prettyprinter, raw-strings-qq @@ -232624,6 +232966,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-foreign_0_15_4" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: + mkDerivation { + pname = "servant-foreign"; + version = "0.15.4"; + sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; + testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; + description = "Helpers for generating clients for servant APIs in any programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-gdp" = callPackage ({ mkDerivation, aeson, base, gdp, servant-server, text }: mkDerivation { @@ -232809,6 +233169,41 @@ self: { broken = true; }) {}; + "servant-http-streams_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.18.3"; + sha256 = "0cc4qmbzq4n1yp5yfg76w1skkksh13qlbza9i2pgsxa9sc39s5fa"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -232988,6 +233383,8 @@ self: { pname = "servant-machines"; version = "0.15.1"; sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4"; + revision = "1"; + editedCabalFile = "0zplgs1kqfmnnx8yv8ay594misiamgmvy41b8w1h3mr7n4vrgk8j"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -233285,6 +233682,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-pipes_0_15_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.15.3"; + sha256 = "1sd01f95rkraa0zdqqg2vwx91zsih0i0hqqkz55nnw9bsbsqhq1n"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-polysemy" = callPackage ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant @@ -233713,6 +234132,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-server_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, directory, exceptions, filepath, hspec + , hspec-discover, hspec-wai, http-api-data, http-media, http-types + , monad-control, mtl, network, network-uri, QuickCheck, resourcet + , safe, servant, should-not-typecheck, sop-core, string-conversions + , tagged, temporary, text, transformers, transformers-base + , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.18.3"; + sha256 = "1gng0in85as45aprwy19xaqlgmwfx0pkly150d2v96knhbcwsshk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network network-uri resourcet servant sop-core string-conversions + tagged text transformers transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory hspec + hspec-wai http-types mtl QuickCheck resourcet safe servant + should-not-typecheck sop-core string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-server-namedargs" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-types, named , servant, servant-namedargs, servant-server, string-conversions @@ -248600,6 +249055,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.2.1"; + sha256 = "1yri2g0wx2fila25ang04nsv4i12b4yhwqwcfkkpx1sz8fhzibxy"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -250146,8 +250623,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "0.1.0.2"; - sha256 = "1zls2k2bzrkwcqav8s416gjsc4rp6glb4rv0ljkjab55ym3fkbqq"; + version = "1.0.0.0"; + sha256 = "0wg3b08gvkcqinc5r9jcrcfrgw0c3mh57ca5hzcrknddwd23flbj"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -252029,13 +252506,13 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.2.1.1"; - sha256 = "1k584gv36xgj87qbrvcl5w9v8z2k7y4csmz737d5r2a8mvf8sf33"; + version = "1.3.0.1"; + sha256 = "1y30qx18ps412r28grlxpfxw3ikirbf3kkxmqwd75ydxp9apn52k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; - license = lib.licenses.gpl2Only; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255524,6 +256001,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.3"; + sha256 = "06c7n1dslxr1m15m8kf35zfn544jm36vk8s3yfrf6h047gd1bs2k"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-checklist" = callPackage ({ mkDerivation, base, exceptions, parameterized-utils, tasty , tasty-expected-failure, tasty-hunit, text @@ -255893,6 +256382,8 @@ self: { pname = "tasty-json"; version = "0.1.0.0"; sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; + revision = "1"; + editedCabalFile = "0jk27ld4l435nnzc80wg6b46ibmc0cmbb0k3hpp58yxbyldr6xdr"; libraryHaskellDepends = [ base bytestring containers stm tagged tasty text ]; @@ -257103,6 +257594,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_6" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.6"; + sha256 = "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell }: mkDerivation { @@ -258841,8 +259344,8 @@ self: { pname = "texrunner"; version = "0.0.1.2"; sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy"; - revision = "2"; - editedCabalFile = "0zv8xp8z2gx9zjqn1f81hri4hn0bws7cq39g5i2g2axrkm9nwj5q"; + revision = "3"; + editedCabalFile = "1l3cpi7yx8jm3653rf3v7midf19i7khc6in75m7zz66124c6i350"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl process semigroups temporary @@ -266639,6 +267142,23 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_1_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "1.1.0.1"; + sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -276998,19 +277518,16 @@ self: { "wai-cli" = callPackage ({ mkDerivation, ansi-terminal, base, http-types, iproute - , monads-tf, network, options, socket-activation, stm - , streaming-commons, unix, wai, wai-extra, warp, warp-tls + , monads-tf, network, options, stm, streaming-commons, transformers + , unix, wai, wai-extra, warp, warp-tls }: mkDerivation { pname = "wai-cli"; - version = "0.2.1"; - sha256 = "1r4lxbjzb5qzn7y0kanlgm8s9a3j1j93cvs74s2bmcc82ysc3x9f"; - revision = "1"; - editedCabalFile = "1h0ip8r0zdm0xzaprfiyfdm40286apyvn6psqnx7pif8acfhpq8m"; + version = "0.2.3"; + sha256 = "0fflvxfc9ibkrrgqdsr89gl77b0b706a8g7ylydaqqz6z089qbi3"; libraryHaskellDepends = [ - ansi-terminal base http-types iproute monads-tf network options - socket-activation stm streaming-commons unix wai wai-extra warp - warp-tls + ansi-terminal base http-types iproute monads-tf network options stm + streaming-commons transformers unix wai wai-extra warp warp-tls ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = lib.licenses.publicDomain; @@ -286379,8 +286896,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.2"; - sha256 = "03wvb5skx41kdmdc6zhydr7zddzyshy2cgk8zmwy26q70z3g01zf"; + version = "0.1.0.3"; + sha256 = "1n8q5dsvs6sh2gzs24m49cz5pg1pavn9sma4fk5jizrjrabik4sj"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64 bytestring conduit containers foldl hashable libyaml mtl scientific @@ -291375,8 +291892,8 @@ self: { ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.1.1"; - sha256 = "1mg3wz3drddxdrbr1b0yw5wayzqi99zfdlgiwvgcc5pxb98i6wk3"; + version = "0.1.2.0"; + sha256 = "0s0svxa7y7a35jg4f0qq6zdg187c2g1s0f3payd26vpwa6rp8f8k"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ base hspec ]; From 9e166662e0cfb73429ecebd96769f9f15c2fc318 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Sun, 27 Jun 2021 07:31:45 +0000 Subject: [PATCH 12/33] localBinInPath: Initial commit --- nixos/modules/config/shells-environment.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index a0a20228a742..c0306bd03b64 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -126,6 +126,14 @@ in type = types.bool; }; + environment.localBinInPath = mkOption { + description = '' + Include ~/.local/bin/ in $PATH. + ''; + default = false; + type = types.bool; + }; + environment.binsh = mkOption { default = "${config.system.build.binsh}/bin/sh"; defaultText = "\${config.system.build.binsh}/bin/sh"; @@ -198,6 +206,11 @@ in # ~/bin if it exists overrides other bin directories. export PATH="$HOME/bin:$PATH" ''} + + ${optionalString cfg.localBinInPath '' + # ~/.local/bin if it exists overrides other bin directories. + export PATH="$HOME/.local/bin:$PATH" + ''} ''; system.activationScripts.binsh = stringAfter [ "stdio" ] From fd6e91c0c703b77b53832a241d37f78c67bfe940 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 27 Jun 2021 12:33:01 +0300 Subject: [PATCH 13/33] haskellPackages.gi-wnck: broken -> unbroken It now links against correct version of libwnck. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d960d4ed8f07..aafc26fb1aaf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1640,7 +1640,6 @@ broken-packages: - gitter - git-vogue - gi-vips - - gi-wnck - glade - glapp - Gleam diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b23a2304728e..422a17ea7c4a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -104129,8 +104129,6 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage From ef6f25e6ff09a81c8ef71385c06a68e2155bb8df Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 27 Jun 2021 12:01:37 +0200 Subject: [PATCH 14/33] haskellPackages.hls-slice-plugin: dontCheck --- pkgs/development/haskell-modules/configuration-darwin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 0c4b46360ba7..492af32edb14 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -173,6 +173,7 @@ self: super: { hls-brittany-plugin = dontCheck super.hls-brittany-plugin; hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; + hls-splice-plugin = dontCheck super.hls-splice-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; From b96f5abe4db06a57a595974a0b3ee37f5ab7e5f0 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 27 Jun 2021 12:07:48 +0200 Subject: [PATCH 15/33] haskellPackages.matrix-client: dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index facd7ab723c7..ca19dc8a8c14 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1932,4 +1932,8 @@ EOT # https://github.com/dagit/zenc/issues/5 zenc = doJailbreak super.zenc; + # Indeterministic tests + # Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37 + matrix-client = dontCheck super.matrix-client; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From ee5d60e0b9e8230214d67ab7dfdd1ce2821a9098 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 27 Jun 2021 12:12:18 +0200 Subject: [PATCH 16/33] haskellPackages.matrix-client: Set maralorn as maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index fa4e798d1d3b..5e5f42157f18 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -218,6 +218,7 @@ package-maintainers: - hlint - hmatrix - iCalendar + - matrix-client - neuron - optics - reflex-dom diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 422a17ea7c4a..90bc3b691868 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -171298,6 +171298,7 @@ self: { ]; description = "A matrix client library"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "matrix-lens" = callPackage From 39609a8ccd44b1e0b0a55b03c3001dc3bd181134 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 27 Jun 2021 13:08:20 +0200 Subject: [PATCH 17/33] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 5 +++++ .../transitive-broken.yaml | 10 ++++------ .../haskell-modules/hackage-packages.nix | 19 +++++++++++++------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index aafc26fb1aaf..9720989eb5dd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -617,6 +617,7 @@ broken-packages: - chunky - church - church-maybe + - churros - cielo - cil - cinvoke @@ -2288,6 +2289,7 @@ broken-packages: - hs-rs-notify - hs-scrape - hsseccomp + - hssh - hs-snowtify - hs-speedscope - hsSqlite3 @@ -2452,6 +2454,7 @@ broken-packages: - initialize - inject-function - inline-asm + - inline-r - inserts - instana-haskell-trace-sdk - instance-map @@ -3596,6 +3599,7 @@ broken-packages: - plat - platinum-parsing - PlayingCards + - plex - plist - plist-buddy - plot-gtk @@ -4868,6 +4872,7 @@ broken-packages: - turing-music - turtle-options - tweak + - twee - twentefp-websockets - twfy-api-client - twhs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5c38f0b040f8..47a28493ee0c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -184,6 +184,7 @@ dont-distribute-packages: - beam-th - beautifHOL - bech32-th + - bech32-th_1_1_1 - bein - belka - BerlekampAlgorithm @@ -363,7 +364,6 @@ dont-distribute-packages: - cfopu - cgrep - chainweb-mining-client - - chakra - chalkboard-viewer - charade - chart-cli @@ -401,7 +401,6 @@ dont-distribute-packages: - clash-verilog - clash-vhdl - classify-frog - - classy-miso - clckwrks - clckwrks-cli - clckwrks-dot-com @@ -1059,6 +1058,7 @@ dont-distribute-packages: - guess-combinator - GuiHaskell - GuiTV + - H - habit - hablo - hablog @@ -1524,6 +1524,7 @@ dont-distribute-packages: - ide-backend-common - ide-backend-server - ige-mac-integration + - ihaskell-inline-r - ihaskell-rlangqq - ihttp - imap @@ -1549,7 +1550,6 @@ dont-distribute-packages: - indentation-trifecta - indexation - IndexedList - - indieweb-algorithms - infernu - InfixApplicative - inline-java @@ -1921,7 +1921,6 @@ dont-distribute-packages: - MFlow - Mhailist - Michelangelo - - microformats2-parser - microformats2-types - micro-gateway - MicrosoftTranslator @@ -2245,6 +2244,7 @@ dont-distribute-packages: - polysemy-path - polysemy-plugin - polysemy-RandomFu + - polysemy-readline - polysemy-resume - polysemy-test - polysemy-time @@ -2475,7 +2475,6 @@ dont-distribute-packages: - rewrite - rewriting - rezoom - - rfc - rfc-env - rfc-http-client - rfc-psql @@ -3101,7 +3100,6 @@ dont-distribute-packages: - vty-ui-extras - waargonaut - wahsp - - wai-cli - wai-devel - wai-dispatch - wai-handler-snap diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 90bc3b691868..ac140df4ff7b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7753,6 +7753,7 @@ self: { ]; description = "The Haskell/R mixed programming environment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "HABQT" = callPackage @@ -53168,7 +53169,6 @@ self: { ]; description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "chalk" = callPackage @@ -54681,6 +54681,8 @@ self: { ]; description = "Channel/Arrow based streaming computation library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cielo" = callPackage @@ -55736,7 +55738,6 @@ self: { testHaskellDepends = [ base miso rfc ]; description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "classy-parallel" = callPackage @@ -138972,6 +138973,8 @@ self: { ]; description = "SSH protocol implementation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsshellscript" = callPackage @@ -145822,6 +145825,7 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -147283,7 +147287,6 @@ self: { ]; description = "A collection of implementations of IndieWeb algorithms"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "indigo" = callPackage @@ -147813,6 +147816,8 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -173794,7 +173799,6 @@ self: { ]; description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -203674,6 +203678,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -205183,6 +205189,7 @@ self: { ]; description = "Readline effect for polysemy"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-resume" = callPackage @@ -223202,7 +223209,6 @@ self: { ]; description = "Robert Fischer's Common library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rfc-env" = callPackage @@ -267679,6 +267685,8 @@ self: { ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "twee-lib" = callPackage @@ -277530,7 +277538,6 @@ self: { ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "wai-conduit" = callPackage From 175aa37e753c25fc992fd28ca47fec6616763bb7 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 27 Jun 2021 14:29:45 +0200 Subject: [PATCH 18/33] haskellPackages.gi-wnck: Unsupported on darwin --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 5e5f42157f18..45d0bdcd0cbb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -357,6 +357,7 @@ unsupported-platforms: gi-ibus: [ x86_64-darwin ] gi-ostree: [ x86_64-darwin ] gi-vte: [ x86_64-darwin ] + gi-wnck: [ x86_64-darwin ] gnome-keyring: [ x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] gtk-sni-tray: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ac140df4ff7b..439dd1d53327 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -104130,6 +104130,9 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = lib.licenses.lgpl21Only; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage From 6955f4e4e63e86090a8905096129154995a210c9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 27 Jun 2021 01:13:30 +0200 Subject: [PATCH 19/33] haskell-generic-builder: support badPlatforms meta.badPlatforms allows us to exclude specific platforms from the list of supported platforms without the need to explicitly substract it from lib.platforms.all (or our inferior equivalent allKnownPlatforms) in platforms. Thus it'll map nicely to unsupported-platforms in the hackage2nix configuration in the future. --- pkgs/development/haskell-modules/generic-builder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bc0d09589022..5bf9f460acf8 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -44,6 +44,7 @@ in , libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" , platforms ? with lib.platforms; all # GHC can cross-compile +, badPlatforms ? lib.platforms.none , hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable @@ -663,6 +664,7 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } + // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; } // optionalAttrs (args ? changelog) { inherit changelog; } ; From dfdc6ad21682c5f552315cd6c719759eb1c4b534 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 29 Jun 2021 21:07:51 +0800 Subject: [PATCH 20/33] haskellPackages.rel8: dontCheck Flakey tests, upstream issue: https://github.com/circuithub/rel8/issues/86 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ca19dc8a8c14..b6e5274be003 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1936,4 +1936,8 @@ EOT # Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37 matrix-client = dontCheck super.matrix-client; + # Flakey tests + # upstream https://github.com/circuithub/rel8/issues/86 + rel8 = dontCheck super.rel8; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 79fb3e33c5129a49870070016486ad95ab27ac7d Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 29 Jun 2021 22:07:11 +0800 Subject: [PATCH 21/33] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../transitive-broken.yaml | 1132 ++++++++--------- 1 file changed, 566 insertions(+), 566 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 47a28493ee0c..3ab2585a9b4e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -5,35 +5,395 @@ dont-distribute-packages: - 4Blocks - - a50 - - abcBridge - - AbortT-monadstf - - AbortT-mtl - - accelerate-arithmetic - - accelerate-fourier - - accelerate-typelits - - access-token-provider - - ac-machine-conduit - - acme-php - - acme-safe - - acousticbrainz-client - - activehs - - actor - AC-Vector-Fancy - - adhoc-network - - adict - ADPfusionForest - ADPfusionSet - - adp-multi-monadiccp - - Advgame - - Advise-me - - aern2-real - AERN-Net - AERN-Real - AERN-Real-Double - AERN-Real-Interval - AERN-RnToRm - AERN-RnToRm-Plot + - ASN1 + - AbortT-monadstf + - AbortT-mtl + - Advgame + - Advise-me + - AlgoRhythm + - AlignmentAlgorithms + - AndroidViewHierarchyImporter + - Annotations + - ApplePush + - AttoJson + - AutoForms + - AvlTree + - BASIC + - Barracuda + - BerlekampAlgorithm + - BioHMM + - Biobase + - BiobaseBlast + - BiobaseDotP + - BiobaseENA + - BiobaseEnsembl + - BiobaseFR3D + - BiobaseFasta + - BiobaseHTTP + - BiobaseHTTPTools + - BiobaseInfernal + - BiobaseMAF + - BiobaseTrainingData + - BiobaseTurner + - BiobaseTypes + - BiobaseVienna + - BiobaseXNA + - BirdPP + - Bitly + - BlastHTTP + - Blobs + - BlogLiterately + - BlogLiterately-diagrams + - Bookshelf + - CBOR + - CC-delcont-alt + - CMCompare + - CPBrainfuck + - CPL + - CSPM-Interpreter + - CSPM-ToProlog + - CSPM-cspm + - CarneadesIntoDung + - Chart-fltkhs + - ClustalParser + - Coadjute + - Combinatorrent + - ComonadSheet + - Condor + - Configger + - Control-Monad-MultiPass + - CoreFoundation + - DMuCheck + - DOM + - DP + - DSH + - DSTM + - Dangerous + - DarcsHelpers + - DefendTheKing + - DifferenceLogic + - DisTract + - DnaProteinAlignment + - DocTest + - DrHylo + - Dust + - Dust-tools + - Dust-tools-pcap + - DysFRP-Cairo + - DysFRP-Craftwerk + - EditTimeReport + - EntrezHTTP + - EsounD + - EtaMOO + - Etage-Graph + - Eternal10Seconds + - Etherbunny + - EventSocket + - FComp + - FM-SBLEX + - FTPLine + - Facts + - FailureT + - FermatsLastMargin + - FieldTrip + - FilePather + - Finance-Treasury + - FiniteMap + - FirstOrderTheory + - Flippi + - Forestry + - FormalGrammars + - Foster + - Frames-beam + - Frames-dsv + - Frank + - GLFW-OGL + - GLFW-task + - GPX + - GPipe-Collada + - GPipe-Examples + - GPipe-GLFW + - GPipe-GLFW4 + - GPipe-TextureLoad + - Gamgine + - GeBoP + - GenI + - GenSmsPdu + - Genbank + - Gene-CluEDO + - GenussFold + - GlomeView + - GoogleDirections + - GoogleSB + - GoogleTranslate + - GrammarProducts + - GraphHammer + - GraphHammer-examples + - GrowlNotify + - Gtk2hsGenerics + - GtkGLTV + - GuiHaskell + - GuiTV + - H + - HAppS-Data + - HAppS-IxSet + - HAppS-Server + - HAppS-State + - HGamer3D-API + - HGamer3D-CAudio-Binding + - HGamer3D-OIS-Binding + - HJScript + - HLearn-algebra + - HLearn-approximation + - HLearn-classification + - HLearn-datastructures + - HLearn-distributions + - HNM + - HPlot + - HPong + - HROOT + - HROOT-core + - HROOT-graf + - HROOT-hist + - HROOT-io + - HROOT-math + - HROOT-tree + - HRay + - HSGEP + - HSHHelpers + - HSoundFile + - HStringTemplateHelpers + - HTab + - HXMPP + - HaMinitel + - HaRe + - HaTeX-meta + - HaTeX-qq + - HaVSA + - Hach + - HarmTrace + - HasGP + - Hashell + - HaskRel + - Hate + - Hawk + - Hayoo + - Hedi + - Hieroglyph + - HiggsSet + - Hipmunk-Utils + - HipmunkPlayground + - Hoed + - Holumbus-Distribution + - Holumbus-MapReduce + - Holumbus-Searchengine + - Holumbus-Storage + - HongoDB + - Hs2lib + - HsParrot + - HsWebots + - Hsed + - Hydrogen + - INblobs + - IORefCAS + - IndexedList + - InfixApplicative + - JSON-Combinator + - JSON-Combinator-Examples + - JSONb + - Javasf + - JsContracts + - JsonGrammar + - JuPyTer-notebook + - JunkDB-driver-gdbm + - JunkDB-driver-hashtables + - KiCS + - KiCS-debugger + - KiCS-prophecy + - LDAPv3 + - LambdaDesigner + - LambdaINet + - LambdaPrettyQuote + - LambdaShell + - LinearSplit + - LinkChecker + - LogicGrowsOnTrees + - LogicGrowsOnTrees-MPI + - LogicGrowsOnTrees-network + - LogicGrowsOnTrees-processes + - LslPlus + - Lucu + - Lykah + - MC-Fold-DP + - MFlow + - MIP-glpk + - MSQueue + - MaybeT-transformers + - MetaObject + - Metrics + - Mhailist + - Michelangelo + - MicrosoftTranslator + - MissingPy + - MonadCatchIO-mtl + - MonadCatchIO-mtl-foreign + - MonadCatchIO-transformers-foreign + - MonadLab + - Monaris + - Monatron-IO + - Monocle + - MuCheck-HUnit + - MuCheck-Hspec + - MuCheck-QuickCheck + - MuCheck-SmallCheck + - MutationOrder + - NXT + - NaperianNetCDF + - NearContextAlgebra + - Ninjas + - NoSlow + - Nomyx + - Nomyx-Core + - Nomyx-Language + - Nomyx-Rules + - Nomyx-Web + - NonEmptyList + - Nussinov78 + - OSM + - OnRmt + - OpenAFP-Utils + - OpenGLCheck + - OpenSCAD + - OpenVG + - PCLT-DB + - PageIO + - Paraiso + - Parallel-Arrows-Eden + - PermuteEffects + - Plot-ho-matic + - PlslTools + - Printf-TH + - ProbabilityMonads + - Pugs + - Pup-Events + - Pup-Events-Demo + - Quelea + - RESTng + - RMP + - RNAFold + - RNAFoldProgs + - RNAdesign + - RNAdraw + - RNAlien + - RNAwolf + - Ranka + - Rlang-QQ + - RollingDirectory + - S3 + - SBench + - SCRIPTWriter + - SCalendar + - SFML-control + - SFont + - SGdemo + - STLinkUSB + - STM32-Zombie + - SVG2Q + - SciFlow + - SciFlow-drmaa + - Scurry + - SelectSequencesFromMSA + - Shellac-compatline + - Shellac-editline + - Shellac-haskeline + - Shellac-readline + - ShortestPathProblems + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-static + - Shpadoinkle-developer-tools + - Shpadoinkle-disembodied + - Shpadoinkle-examples + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-template + - Shpadoinkle-widgets + - SimpleGL + - SimpleLog + - SimpleServer + - Smooth + - Snusmumrik + - SoccerFun + - SoccerFunGL + - SourceGraph + - SpinCounter + - Spock-auth + - Spock-lucid + - Spock-worker + - StockholmAlignment + - Strafunski-Sdf2Haskell + - SyntaxMacros + - Taxonomy + - TaxonomyTools + - TeX-my-math + - TeaHS + - TreeCounter + - Treiber + - TrieMap + - TypeClass + - TypeIlluminator + - UMM + - URLT + - UrlDisp + - ViennaRNA-extras + - WAVE + - WEditorBrick + - WEditorHyphen + - WL500gPControl + - WURFL + - WXDiffCtrl + - WashNGo + - WaveFront + - WebBits-Html + - WebBits-multiplate + - WebCont + - WordAlignment + - WxGeneric + - XML + - XMPP + - XSaiga + - YACPong + - Yablog + - Yogurt + - Yogurt-Standalone + - Z-Botan + - Z-IO + - Z-MessagePack + - Z-YAML + - a50 + - abcBridge + - ac-machine-conduit + - accelerate-arithmetic + - accelerate-fourier + - accelerate-typelits + - access-token-provider + - acme-php + - acme-safe + - acousticbrainz-client + - activehs + - actor + - adhoc-network + - adict + - adp-multi-monadiccp + - aern2-real - aeson-native - afv - agda-server @@ -46,8 +406,6 @@ dont-distribute-packages: - algebra-driven-design - algebra-sql - algolia - - AlgoRhythm - - AlignmentAlgorithms - alms - alpha - alsa-gui @@ -58,18 +416,18 @@ dont-distribute-packages: - amqp-streamly - analyze-client - anatomy - - AndroidViewHierarchyImporter - animate-example - animate-frames - animate-preview - animate-sdl2 - annah - - Annotations - anonymous-sums-tests - antagonist - anticiv - antlrc - apelsin + - api-rpc-pegnet + - api-yoti - apiary - apiary-authenticate - apiary-clientsession @@ -85,11 +443,8 @@ dont-distribute-packages: - apiary-redis - apiary-session - apiary-websockets - - api-rpc-pegnet - apis - - api-yoti - apotiki - - ApplePush - approx-rand-test - arbor-monad-metric-datadog - arch-hs @@ -104,7 +459,6 @@ dont-distribute-packages: - arraylist - ascii-table - asic - - ASN1 - assert4hs-hspec - assert4hs-tasty - assimp @@ -114,7 +468,6 @@ dont-distribute-packages: - atmos-dimensional-tf - atomic-primops-foreign - atp - - AttoJson - attoparsec-enumerator - attoparsec-iteratee - attoparsec-text-enumerator @@ -122,13 +475,11 @@ dont-distribute-packages: - audiovisual - aura - authoring - - AutoForms - autonix-deps-kf5 - avers - avers-api - avers-api-docs - avers-server - - AvlTree - avro-piper - awesomium - awesomium-glut @@ -150,6 +501,7 @@ dont-distribute-packages: - azure-functions-worker - azure-service-api - azure-servicebus + - b-tree - babylon - backblaze-b2-hs - backdropper @@ -162,12 +514,10 @@ dont-distribute-packages: - bamboo-theme-mini-html5 - bamse - bamstats - - Barracuda - base16-lens - base32-bytestring - base64-bytes - baserock-schema - - BASIC - batchd - battlenet-yesod - battleships @@ -187,7 +537,6 @@ dont-distribute-packages: - bech32-th_1_1_1 - bein - belka - - BerlekampAlgorithm - berp - bff - bglib @@ -198,32 +547,15 @@ dont-distribute-packages: - binary-file - binary-protocol-zmq - binary-streams + - binding-wx - bindings-apr-util - bindings-linux-videodev2 - bindings-ppdev - - binding-wx - binembed-example - bioace - bioalign - - Biobase - - BiobaseBlast - - BiobaseDotP - - BiobaseENA - - BiobaseEnsembl - - BiobaseFasta - - BiobaseFR3D - - BiobaseHTTP - - BiobaseHTTPTools - - BiobaseInfernal - - BiobaseMAF - - BiobaseTrainingData - - BiobaseTurner - - BiobaseTypes - - BiobaseVienna - - BiobaseXNA - biofasta - biofastq - - BioHMM - bioinformatics-toolkit - biophd - biopsl @@ -232,27 +564,24 @@ dont-distribute-packages: - bip32 - birch-beer - bird - - BirdPP - bit-array - bitcoin-address - bitcoin-api - bitcoin-api-extra - bitcoin-block - bitcoin-compact-filters - - bitcoind-regtest - - bitcoind-rpc - bitcoin-keys - bitcoin-rpc - bitcoin-scripting - bitcoin-tx - bitcoin-types - - Bitly + - bitcoind-regtest + - bitcoind-rpc - bitly-cli - bitmaps - bittorrent - bla - blakesum-demo - - BlastHTTP - blastxml - blatex - blaze-builder-enumerator @@ -260,10 +589,7 @@ dont-distribute-packages: - ble - blink1 - blip - - Blobs - blogination - - BlogLiterately - - BlogLiterately-diagrams - bloodhound-amazonka-auth - bloxorz - blubber @@ -274,7 +600,6 @@ dont-distribute-packages: - bond-haskell - bond-haskell-compiler - bookkeeper-permissions - - Bookshelf - boomslang - boopadoop - boots-cloud @@ -293,7 +618,6 @@ dont-distribute-packages: - bronyradiogermany-streaming - brotli-conduit - brotli-streams - - b-tree - btree - buchhaltung - buildbox-tools @@ -310,14 +634,14 @@ dont-distribute-packages: - bytelog - bytestring-read - c0check - - cabal2arch - cabal-bounds - cabal-cache - cabal-cargs - - cabalmdvrpm - cabal-query - - cabalrpmdeps - cabal-test + - cabal2arch + - cabalmdvrpm + - cabalrpmdeps - cake - cakyrespa - cal3d-examples @@ -333,9 +657,8 @@ dont-distribute-packages: - canteven-http - cao - cap - - carboncopy - - CarneadesIntoDung - car-pool + - carboncopy - cartel - casadi-bindings - casadi-bindings-control @@ -349,8 +672,6 @@ dont-distribute-packages: - casui - categorical-algebra - category-extras - - CBOR - - CC-delcont-alt - cctools-workqueue - cef3-simple - ceilometer-common @@ -367,7 +688,6 @@ dont-distribute-packages: - chalkboard-viewer - charade - chart-cli - - Chart-fltkhs - chart-svg - chart-svg-various - chart-unit @@ -422,38 +742,33 @@ dont-distribute-packages: - cloud-seeder - cloudyfs - clua - - ClustalParser - clustertools - clutterhs - cmathml3 - - CMCompare - cmptype - cmv - cnc-spec-compiler - - Coadjute - - codec + - co-feldspar + - co-log-polysemy-formatting - code-conjure + - codec - codec-rpm - codemonitor - - co-feldspar - cognimeta-utils - coinbase-exchange - colada - collapse-duplication - collection-json - collections-base-instances - - co-log-polysemy-formatting - color-counter - colorless-http-client - colorless-scotty - colour-space - columbia - comark - - Combinatorrent - comic - commsec-keyexchange - comonad-random - - ComonadSheet - compact-mutable - complexity - computational-algebra @@ -463,7 +778,6 @@ dont-distribute-packages: - concrete-haskell - concrete-haskell-autogen - condor - - Condor - conductive-hsc3 - conductive-song - conduit-vfs-zip @@ -473,9 +787,8 @@ dont-distribute-packages: - conferer-source-dhall - conferer-source-yaml - conffmt - - Configger - - configifier - config-select + - configifier - configurator-ng - constraint-manip - constructible @@ -487,7 +800,6 @@ dont-distribute-packages: - control - control-monad-attempt - control-monad-exception-monadsfd - - Control-Monad-MultiPass - conversions - convert - convertible-ascii @@ -499,13 +811,10 @@ dont-distribute-packages: - copilot-language - copilot-libraries - copilot-theorem - - CoreFoundation - coroutine-enumerator - coroutine-iteratee - - couchdb-enumerator - couch-simple - - CPBrainfuck - - CPL + - couchdb-enumerator - cprng-aes-effect - cql-io-tinylog - cqrs-example @@ -525,17 +834,14 @@ dont-distribute-packages: - criu-rpc - crockford - cron-compat - - cryptocipher - crypto-conduit + - cryptocipher - cryptoids - cryptoids-class - cryptol - crystalfontz - csg - cspmchecker - - CSPM-cspm - - CSPM-Interpreter - - CSPM-ToProlog - csv-enumerator - ctpl - cube @@ -543,13 +849,11 @@ dont-distribute-packages: - cursor-fuzzy-time-gen - cv-combinators - cypher - - Dangerous - dapi - darcs-benchmark - darcs-beta - - darcsden - darcs-fastconvert - - DarcsHelpers + - darcsden - darcswatch - darkplaces-demo - darkplaces-rcon-util @@ -557,9 +861,7 @@ dont-distribute-packages: - data-accessor-monads-fd - data-basic - data-cycle - - datadog-tracing - data-elf - - dataflow - data-layer - data-lens-fd - data-lens-ixset @@ -569,6 +871,8 @@ dont-distribute-packages: - data-result - data-rtuple - data-structure-inferrer + - datadog-tracing + - dataflow - date-conversions - dbjava - dbus-client @@ -583,11 +887,11 @@ dont-distribute-packages: - ddc-core-simpl - ddc-core-tetra - ddc-driver - - ddci-core - ddc-interface - ddc-source-tetra - ddc-tools - ddc-war + - ddci-core - debug - debug-trace-var - decidable @@ -596,7 +900,6 @@ dont-distribute-packages: - deeplearning-hs - deepzoom - defargs - - DefendTheKing - definitive-graphics - deka-tests - delaunay @@ -605,9 +908,9 @@ dont-distribute-packages: - delimiter-separated - delta - delta-h + - dep-t-advice - dependent-state - dephd - - dep-t-advice - deptrack-devops - deptrack-dot - dequeue @@ -617,6 +920,7 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-docs + - di-polysemy - dia-functions - diagrams-haddock - diagrams-html5 @@ -624,7 +928,6 @@ dont-distribute-packages: - diagrams-pgf - diagrams-reflex - diagrams-wx - - DifferenceLogic - difference-monoid - digestive-functors-hsp - dingo-core @@ -632,14 +935,12 @@ dont-distribute-packages: - dingo-widgets - diplomacy - diplomacy-server - - di-polysemy - dirfiles - discogs-haskell - discord-gateway - discord-hs - discord-register - discord-rest - - DisTract - distributed-process-async - distributed-process-azure - distributed-process-client-server @@ -664,18 +965,13 @@ dont-distribute-packages: - dmenu-pkill - dmenu-pmount - dmenu-search - - DMuCheck - - DnaProteinAlignment - doc-review - - DocTest - doi - - DOM - domain - domain-core - domain-optics - dow - download-media-content - - DP - dph-examples - dph-lifted-base - dph-lifted-copy @@ -683,25 +979,17 @@ dont-distribute-packages: - dph-prim-interface - dph-prim-par - dph-prim-seq - - DrHylo - dropbox-sdk - dropsolve - - DSH - dsh-sql - dsmc-tools - - DSTM - dtd - dumb-cas - - Dust - - Dust-tools - - Dust-tools-pcap - dvda - dynamic-cabal - dynamic-pipeline - dynamic-plot - dynobud - - DysFRP-Cairo - - DysFRP-Craftwerk - eccrypto-ed25519-bindings - ecdsa - edenskel @@ -709,7 +997,6 @@ dont-distribute-packages: - edge - edges - editable - - EditTimeReport - effective-aspects-mzv - egison - egison-pattern-src-haskell-mode @@ -728,7 +1015,6 @@ dont-distribute-packages: - embroidery - engine-io-growler - entangle - - EntrezHTTP - enumerate - enumerate-function - enumerator-fd @@ -741,25 +1027,19 @@ dont-distribute-packages: - errors-ext - ersatz-toysat - esotericbot - - EsounD - estreps - - Etage-Graph - - EtaMOO - - Eternal10Seconds - eternity - eternity-timestamped - ether - - Etherbunny - ethereum-analyzer - ethereum-analyzer-cli - ethereum-analyzer-webui - ethereum-client-haskell - ethereum-merkle-patricia-db - evdev-streamly + - event-monad - eventful-postgresql - eventful-sqlite - - event-monad - - EventSocket - eventsource-geteventstore-store - every-bit-counts - exception-monads-fd @@ -776,25 +1056,22 @@ dont-distribute-packages: - extensible-data - extract-dependencies - extrapolate - - Facts - factual-api - - FailureT - fakedata-quickcheck - - fallingblocks - falling-turnip + - fallingblocks - family-tree - fast-digits - fastirc - fault-tree - fbrnch - fcd - - FComp - feature-flipper-postgres - fedora-img-dl - - feed2lj - - feed2twitter - feed-gipeda - feed-translator + - feed2lj + - feed2twitter - fei-base - fei-cocoapi - fei-dataiter @@ -804,33 +1081,26 @@ dont-distribute-packages: - fei-nn - feldspar-compiler - feldspar-language - - FermatsLastMargin - festung - ffmpeg-tutorials - ficketed - fields - - FieldTrip - filepath-crypto - - filepather - - FilePather - filepath-io-access + - filepather - filesystem-enumerator - - Finance-Treasury - find-clumpiness - findhttp - - FiniteMap - firstify - - FirstOrderTheory + - fix-parser-simple - fixed-point-vector - fixed-point-vector-space - fixhs - - fix-parser-simple - flac-picture - flashblast - flatbuffers - flexiwrap - flexiwrap-smallcheck - - Flippi - flite - flowdock-api - flower @@ -842,13 +1112,10 @@ dont-distribute-packages: - fltkhs-themes - fluent-logger - fluent-logger-conduit - - FM-SBLEX - foldl-transduce-attoparsec - follower - foo - - Forestry - formal - - FormalGrammars - format - format-status - forml @@ -858,28 +1125,23 @@ dont-distribute-packages: - fortran-src-extras - foscam-directory - foscam-sort - - Foster - fp-ieee - fplll - fpnla-examples - frame-markdown - - Frames-beam - - Frames-dsv - - Frank - - freekick2 - - freelude - - freer-converse - free-theorems-counterexamples - free-theorems-seq - free-theorems-seq-webui - free-theorems-webui + - freekick2 + - freelude + - freer-converse - frpnow-gloss - frpnow-gtk - frpnow-gtk3 - frpnow-vty - ftdi - ftp-client-conduit - - FTPLine - ftree - ftshell - funbot @@ -887,8 +1149,8 @@ dont-distribute-packages: - funcons-lambda-cbv-mp - funcons-simple - funcons-tools - - functional-arrow - function-combine + - functional-arrow - functor-combo - funflow-nix - funion @@ -902,12 +1164,10 @@ dont-distribute-packages: - g2q - gact - galois-fft - - Gamgine - gargoyle-postgresql-connect - gbu - gdax - gdiff-ig - - GeBoP - gedcom - geek - geek-server @@ -916,18 +1176,13 @@ dont-distribute-packages: - gelatin-gl - gelatin-sdl2 - gelatin-shaders - - Genbank - - Gene-CluEDO - generics-mrsop-gdiff - genesis - genesis-test - - GenI - - geniconvert - geni-gui - - geniserver - geni-util - - GenSmsPdu - - GenussFold + - geniconvert + - geniserver - geodetic - geolite-csv - getemx @@ -937,11 +1192,11 @@ dont-distribute-packages: - ghc-debug-stub - ghc-imported-from - ghc-instances - - ghci-pretty - - ghcjs-hplay - ghc-mod - ghc-tags-plugin - ghc-vis + - ghci-pretty + - ghcjs-hplay - ght - gi-cairo-again - gi-gsk @@ -949,11 +1204,11 @@ dont-distribute-packages: - gi-gtk_4_0_4 - git-fmt - git-gpush + - git-object + - git-remote-ipfs - github-webhook-handler-snap - gitlib-cross - gitlib-s3 - - git-object - - git-remote-ipfs - givegif - gladexml-accessor - glazier @@ -961,12 +1216,9 @@ dont-distribute-packages: - glazier-react - glazier-react-examples - glazier-react-widget - - GLFW-OGL - - GLFW-task - global - global-config - glome-hs - - GlomeView - gloss-accelerate - gloss-devil - gloss-examples @@ -982,14 +1234,11 @@ dont-distribute-packages: - goal-probability - goal-simulation - goat - - GoogleDirections - google-drive - google-mail-filters - google-maps-geocoding - - googleplus - - GoogleSB - google-static-maps - - GoogleTranslate + - googleplus - gore-and-ash-actor - gore-and-ash-async - gore-and-ash-demo @@ -999,27 +1248,15 @@ dont-distribute-packages: - gore-and-ash-network - gore-and-ash-sdl - gore-and-ash-sync - - GPipe-Collada - - GPipe-Examples - - GPipe-GLFW - - GPipe-GLFW4 - - GPipe-TextureLoad - gps - gps2htmlReport - - GPX - grab-form - graflog - grammar-combinators - - GrammarProducts - grapefruit-examples - grapefruit-records - grapefruit-ui - grapefruit-ui-gtk - - GraphHammer - - GraphHammer-examples - - graphicsFormats - - graphicstools - - graphql-client - graph-rewriting-cl - graph-rewriting-gl - graph-rewriting-lambdascope @@ -1028,13 +1265,15 @@ dont-distribute-packages: - graph-rewriting-strategies - graph-rewriting-trs - graph-rewriting-ww - - graphtype - graph-visit + - graphicsFormats + - graphicstools + - graphql-client + - graphtype - greencard-lib + - grid-proto - gridbounds - gridland - - grid-proto - - GrowlNotify - grpc-etcd-client - grpc-haskell - grpc-haskell-core @@ -1045,29 +1284,22 @@ dont-distribute-packages: - gsmenu - gstorable - gtfs + - gtk-serialized-event - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs - gtk2hs-cast-gtkglext - gtk2hs-cast-gtksourceview2 - - Gtk2hsGenerics - - GtkGLTV - gtkimageview - gtkrsync - - gtk-serialized-event - guarded-rewriting - guess-combinator - - GuiHaskell - - GuiTV - - H + - hArduino + - hOff-display + - hPDB + - hPDB-examples - habit - hablo - hablog - - Hach - - hack2-handler-happstack-server - - hack2-handler-mongrel2-http - - hack2-handler-snap-server - - hackage2twitter - - hackage-server - hack-contrib - hack-contrib-press - hack-handler-epoll @@ -1075,10 +1307,15 @@ dont-distribute-packages: - hack-handler-fastcgi - hack-handler-hyena - hack-handler-simpleserver - - hackmanager - hack-middleware-cleanpath - hack-middleware-clientsession - hack-middleware-jsonp + - hack2-handler-happstack-server + - hack2-handler-mongrel2-http + - hack2-handler-snap-server + - hackage-server + - hackage2twitter + - hackmanager - haddock - haddock_2_23_1 - haddocset @@ -1093,16 +1330,12 @@ dont-distribute-packages: - halma-gui - halma-telegram-bot - ham - - HaMinitel - hamusic - hans-pcap - happlets-lib-gtk - - HAppS-Data - happs-hsp - happs-hsp-template - - HAppS-IxSet - - HAppS-Server - - HAppS-State + - happs-tutorial - happstack-auth - happstack-authenticate - happstack-contrib @@ -1117,48 +1350,26 @@ dont-distribute-packages: - happstack-state - happstack-static-routing - happstack-yui - - happs-tutorial - happybara-webkit - haquil - - hArduino - hardware-edsl - - HaRe - harg - hark - harmony - - HarmTrace - haroonga-httpd + - has-th - hascat - hascat-lib - hascat-setup - hascat-system - - HasGP - - Hashell - hashflare + - hask-home - haskarrow - haskdeep - haskeem - haskell-abci - haskell-aliyun - haskell-bitmex-client - - haskelldb-connect-hdbc - - haskelldb-connect-hdbc-catchio-mtl - - haskelldb-connect-hdbc-catchio-tf - - haskelldb-connect-hdbc-catchio-transformers - - haskelldb-connect-hdbc-lifted - - haskelldb-dynamic - - haskelldb-flat - - haskelldb-hdbc - - haskelldb-hdbc-mysql - - haskelldb-hdbc-odbc - - haskelldb-hdbc-postgresql - - haskelldb-hdbc-sqlite3 - - haskelldb-hsql - - haskelldb-hsql-mysql - - haskelldb-hsql-odbc - - haskelldb-hsql-postgresql - - haskelldb-hsql-sqlite3 - - haskelldb-th - haskell-docs - haskell-eigen-util - haskell-ftp @@ -1182,10 +1393,27 @@ dont-distribute-packages: - haskell-tools-refactor - haskell-tools-rewrite - haskell-tor + - haskelldb-connect-hdbc + - haskelldb-connect-hdbc-catchio-mtl + - haskelldb-connect-hdbc-catchio-tf + - haskelldb-connect-hdbc-catchio-transformers + - haskelldb-connect-hdbc-lifted + - haskelldb-dynamic + - haskelldb-flat + - haskelldb-hdbc + - haskelldb-hdbc-mysql + - haskelldb-hdbc-odbc + - haskelldb-hdbc-postgresql + - haskelldb-hdbc-sqlite3 + - haskelldb-hsql + - haskelldb-hsql-mysql + - haskelldb-hsql-odbc + - haskelldb-hsql-postgresql + - haskelldb-hsql-sqlite3 + - haskelldb-th - haskelm - haskey-mtl - haskgame - - hask-home - haskoin-bitcoind - haskoin-core - haskoin-crypto @@ -1201,7 +1429,6 @@ dont-distribute-packages: - haskore-realtime - haskore-supercollider - haskore-synthesizer - - HaskRel - hasktorch - hasktorch-ffi-thc - hasktorch-indef @@ -1222,16 +1449,9 @@ dont-distribute-packages: - haste-lib - haste-markup - haste-perch - - has-th - - Hate - - HaTeX-meta - hatexmpp3 - - HaTeX-qq - - HaVSA - hawitter - - Hawk - haxy - - Hayoo - hback - hbayes - hbb @@ -1252,15 +1472,14 @@ dont-distribute-packages: - hdph - heart-app - heatitup + - heavy-log-shortcuts - heavy-logger - heavy-logger-amazon - heavy-logger-instances - - heavy-log-shortcuts - hecc - hedgehog-checkers-lens - hedgehog-fakedata - hedgehog-gen-json - - Hedi - hedis-pile - heist-aeson - helics @@ -1287,16 +1506,11 @@ dont-distribute-packages: - hfd - hfiar - hgalib - - HGamer3D-API - - HGamer3D-CAudio-Binding - - HGamer3D-OIS-Binding - hgen - hgeometry-svg - hgithub - hiccup - hierarchical-spectral-clustering - - Hieroglyph - - HiggsSet - highjson-swagger - highjson-th - himpy @@ -1307,8 +1521,6 @@ dont-distribute-packages: - hinvaders - hinze-streams - hipbot - - HipmunkPlayground - - Hipmunk-Utils - hipsql-client - hipsql-server - hirt @@ -1319,15 +1531,9 @@ dont-distribute-packages: - hist-pl-lmf - hit - hit-graph - - HJScript - hjsonschema - hjugement-cli - hlcm - - HLearn-algebra - - HLearn-approximation - - HLearn-classification - - HLearn-datastructures - - HLearn-distributions - hledger-api - hlrdb - hls @@ -1339,20 +1545,12 @@ dont-distribute-packages: - hmm-lapack - hmt - hmt-diagrams - - HNM - hnormalise - hob - - Hoed - - hOff-display - hogre - hogre-examples - - Holumbus-Distribution - - Holumbus-MapReduce - - Holumbus-Searchengine - - Holumbus-Storage - holy-project - hommage - - HongoDB - hood - hoodie - hoodle @@ -1371,11 +1569,7 @@ dont-distribute-packages: - hpage - hpaste - hpc-tracer - - hPDB - - hPDB-examples - hplayground - - HPlot - - HPong - hpqtypes-extras - hprotoc-fork - hps @@ -1383,26 +1577,21 @@ dont-distribute-packages: - hpython - hquantlib - hranker - - HRay - hreader - hreader-lens - hreq-client - hreq-conduit - - HROOT - - HROOT-core - - HROOT-graf - - HROOT-hist - - HROOT-io - - HROOT-math - - HROOT-tree + - hs-blake2 + - hs-brotli + - hs-ffmpeg + - hs-gen-iface + - hs-pkpass + - hs-swisstable-hashtables-class - hs2dot - - Hs2lib - hsautogui - hsbackup - hsbencher-codespeed - hsbencher-fusion - - hs-blake2 - - hs-brotli - hsc3-auditor - hsc3-cairo - hsc3-data @@ -1422,24 +1611,16 @@ dont-distribute-packages: - hscassandra - hscope - hsdev - - Hsed - hset - hsfacter - - hs-ffmpeg - - hs-gen-iface - - HSGEP - - HSHHelpers - hslogstash - hsnock - - HSoundFile - - HsParrot - hspec-expectations-pretty - hspec-pg-transact - hspec-setup - hspec-shouldbe - hspec-test-sandbox - hspecVariant - - hs-pkpass - hsprocess - hsql-mysql - hsql-odbc @@ -1450,24 +1631,20 @@ dont-distribute-packages: - hsqml-morris - hsreadability - hssqlppp-th - - hs-swisstable-hashtables-class - hstar - hstox - hstradeking - - HStringTemplateHelpers - hstzaar - hsubconvert - - HsWebots - hswip - hsx-jmacro - hsx-xhtml - - HTab - hts - - http2-client-exe - - http2-client-grpc - http-client-auth - http-enumerator - http-io-streams + - http2-client-exe + - http2-client-grpc - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -1488,14 +1665,13 @@ dont-distribute-packages: - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-simd-cli + - hw-uri - hworker-ses - hwormhole - hws - - hw-simd-cli - hwsl2-bytevector - hwsl2-reducers - - hw-uri - - HXMPP - hxmppc - hxournal - hxt-binary @@ -1503,7 +1679,6 @@ dont-distribute-packages: - hxthelper - hxweb - hybrid - - Hydrogen - hydrogen-cli - hydrogen-cli-args - hydrogen-data @@ -1517,12 +1692,12 @@ dont-distribute-packages: - hyloutils - hyperpublic - ice40-prim - - ideas-math - - ideas-math-types - - ideas-statistics - ide-backend - ide-backend-common - ide-backend-server + - ideas-math + - ideas-math-types + - ideas-statistics - ige-mac-integration - ihaskell-inline-r - ihaskell-rlangqq @@ -1540,7 +1715,6 @@ dont-distribute-packages: - importify - imprevu-happstack - improve - - INblobs - inch - incremental-computing - incremental-maps @@ -1549,9 +1723,7 @@ dont-distribute-packages: - indentation-parsec - indentation-trifecta - indexation - - IndexedList - infernu - - InfixApplicative - inline-java - inspector-wrecker - instant-aeson @@ -1566,7 +1738,6 @@ dont-distribute-packages: - intset - invertible-hlist - ion - - IORefCAS - ipatch - ipc - ipld-cid @@ -1581,12 +1752,12 @@ dont-distribute-packages: - ismtp - isobmff-builder - isohunt + - iter-stats - iteratee-compress - iteratee-mtl - iteratee-parsec - iteratee-stm - iterio-server - - iter-stats - ivor - ivory-avr-atmega328p-registers - ivory-backend-c @@ -1604,10 +1775,9 @@ dont-distribute-packages: - jail - java-bridge-extras - java-character - - javaclass - java-reflect + - javaclass - javasf - - Javasf - jmacro - jmacro-rpc - jmacro-rpc-happstack @@ -1616,26 +1786,18 @@ dont-distribute-packages: - jobs-ui - join - jot - - JsContracts - jsmw - - json2-hdbc - json-ast-json-encoder - json-autotype - json-b - - JSONb - - JSON-Combinator - - JSON-Combinator-Examples - json-enumerator - - JsonGrammar - json-incremental-decoder - json-query - - jsons-to-schema - json-togo - json-tokens + - json2-hdbc + - jsons-to-schema - jspath - - JunkDB-driver-gdbm - - JunkDB-driver-hashtables - - JuPyTer-notebook - jvm - jvm-batching - jvm-streaming @@ -1662,20 +1824,17 @@ dont-distribute-packages: - keera-hails-reactive-fs - keera-hails-reactive-gtk - keera-hails-reactive-htmldom - - keera-hails-reactivelenses - keera-hails-reactive-network - keera-hails-reactive-polling - keera-hails-reactive-wx - keera-hails-reactive-yampa + - keera-hails-reactivelenses - keera-posture - kevin - keysafe - keyvaluehash - keyword-args - kicad-data - - KiCS - - KiCS-debugger - - KiCS-prophecy - kif-parser - kit - kleene @@ -1694,8 +1853,12 @@ dont-distribute-packages: - labyrinth - labyrinth-server - laika - - lambdabot-zulip - lambda-calculator + - lambda-devs + - lambda-options + - lambdaFeed + - lambdaLit + - lambdabot-zulip - lambdacms-media - lambdacube - lambdacube-bullet @@ -1706,21 +1869,13 @@ dont-distribute-packages: - lambdacube-examples - lambdacube-gl - lambdacube-samples - - LambdaDesigner - - lambda-devs - - lambdaFeed - - LambdaINet - - lambdaLit - - lambda-options - - LambdaPrettyQuote - - LambdaShell - lambdaya-bus - lambdiff - lang + - language-Modula2 - language-boogie - language-eiffel - language-kort - - language-Modula2 - language-ninja - language-oberon - language-python-colour @@ -1740,7 +1895,6 @@ dont-distribute-packages: - lazy-hash - lazy-hash-cache - ldapply - - LDAPv3 - leaky - lean - legion @@ -1776,8 +1930,6 @@ dont-distribute-packages: - linear-circuit - linearmap-category - linearscan-hoopl - - LinearSplit - - LinkChecker - linkchk - linkcore - linux-ptrace @@ -1787,15 +1939,15 @@ dont-distribute-packages: - liquid-bytestring - liquid-containers - liquid-ghc-prim - - liquidhaskell-cabal-demo - liquid-parallel - liquid-platform - liquid-prelude - liquid-vector - - listenbrainz-client + - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser - list-witnesses + - listenbrainz-client - live-sequencer - llvm - llvm-analysis @@ -1811,57 +1963,51 @@ dont-distribute-packages: - llvm-tf - llvm-tools - lmonad-yesod - - localize - local-search + - localize - locked-poll - log - - logging-effect-extra - - logic-classes - - LogicGrowsOnTrees - - LogicGrowsOnTrees-MPI - - LogicGrowsOnTrees-network - - LogicGrowsOnTrees-processes - log-postgres - log-utils + - logging-effect-extra + - logic-classes - lojban - lojysamban - lol-apps - lol-benches - lol-cpp - - loli - lol-repa - lol-tests - lol-typing + - loli - longshot - loop-effin - lorentz - lostcities - loup - - LslPlus - ls-usb - lsystem - lti13 - luachunk - lucid-colonnade - lucienne - - Lucu - luhn - lui - luminance-samples - lvish - - Lykah - lz4-conduit - lzma-enumerator + - mDNSResponder-client - macbeth-lib - machines-amazonka - macosx-make-standalone + - magic-wormhole - magicbane - magico - - magic-wormhole - mahoro - maid - - mailgun - mail-pool + - mailgun - majordomo - majority - manatee @@ -1881,27 +2027,24 @@ dont-distribute-packages: - manifold-random - manifolds - marionetta - - markdown2svg - markdown-pap + - markdown2svg - markov-processes - marmalade-upload - marquise - marvin - masakazu-bot - matchers - - mathblog - - mathlink - math-programming-glpk - math-programming-tests + - mathblog + - mathlink - matsuri - maxent - maxent-learner-hw-gui - maxsharing - - MaybeT-transformers - - MC-Fold-DP - mcmc - mcmc-samplers - - mDNSResponder-client - mealy - mediabus-fdk-aac - mediabus-rtp @@ -1911,19 +2054,13 @@ dont-distribute-packages: - mergeful-persistent - mergeless-persistent - merkle-patricia-db - - MetaObject - meta-par-accelerate - metaplug - metar - metar-http - - Metrics - metronome - - MFlow - - Mhailist - - Michelangelo - - microformats2-types - micro-gateway - - MicrosoftTranslator + - microformats2-types - midimory - mighttpd - minecraft-data @@ -1933,11 +2070,9 @@ dont-distribute-packages: - minilight-lua - minimung - minioperational - - MIP-glpk - miss - - MissingPy - - missing-py2 - miss-porcelain + - missing-py2 - mixed-strategies - mkbndl - mkcabal @@ -1948,25 +2083,18 @@ dont-distribute-packages: - moan - modify-fasta - modsplit - - modularity - modular-prelude-classy + - modularity - modulo - mole - - MonadCatchIO-mtl - - MonadCatchIO-mtl-foreign - - MonadCatchIO-transformers-foreign - monad-exception - - monadiccp-gecode - - MonadLab - monad-state - monad-stlike-stm + - monadiccp-gecode - monarch - - Monaris - - Monatron-IO - monetdb-mapi - mongrel2-handler - monky - - Monocle - monte-carlo - moo - moo-nad @@ -1986,16 +2114,12 @@ dont-distribute-packages: - msgpack-idl - msgpack-rpc - msgpack-rpc-conduit - - MSQueue - mtgoxapi - - MuCheck-Hspec - - MuCheck-HUnit - - MuCheck-QuickCheck - - MuCheck-SmallCheck - mu-grpc-client - mu-grpc-server - - multibase + - mu-tracing - multi-cabal + - multibase - multifocal - multihash-serialise - multilinear-io @@ -2005,7 +2129,6 @@ dont-distribute-packages: - multisetrewrite - murder - murmurhash3 - - musicbrainz-email - music-graphics - music-parts - music-pitch @@ -2013,39 +2136,36 @@ dont-distribute-packages: - music-score - music-sibelius - music-suite + - musicbrainz-email - musicxml2 - mutable-iter - - MutationOrder - mute-unmute - - mu-tracing - - mvclient - mvc-updates + - mvclient - mxnet-dataiter - mxnet-examples - mxnet-nn + - myTestlll - mysnapsession-example - mysql-haskell-openssl - mysql-simple-typed - - myTestlll - mywatch - n2o-web - nakadi-client - nanovg-simple - - NaperianNetCDF - nats-queue - natural-number - - NearContextAlgebra - nemesis-titan - nerf - nero-wai - nero-warp - nested-routes - - netcore - - netlines - net-spider-cli - net-spider-pangraph - net-spider-rpl - net-spider-rpl-cli + - netcore + - netlines - netstring-enumerator - nettle-frp - nettle-netkit @@ -2070,31 +2190,21 @@ dont-distribute-packages: - ngrams-loader - ngx-export-tools-extra - nikepub - - Ninjas - nirum - nlp-scores-scripts - - Nomyx - nomyx-api - nomyx-core - - Nomyx-Core - nomyx-language - - Nomyx-Language - nomyx-library - - Nomyx-Rules - nomyx-server - - Nomyx-Web - - NonEmptyList - - NoSlow - notmuch-haskell - notmuch-web - - numerical - numeric-ode + - numerical - numhask-hedgehog - numhask-histogram - numhask-range - numhask-test - - Nussinov78 - - NXT - nymphaea - obd - obdd @@ -2114,17 +2224,12 @@ dont-distribute-packages: - one-liner_2_0 - online - online-csv - - OnRmt - open-adt-tutorial - - OpenAFP-Utils - - OpenGLCheck + - open-union - openpgp-crypto-api - - OpenSCAD - openssh-github-keys - opentracing-jaeger - opentracing-zipkin-v1 - - open-union - - OpenVG - optima-for-hasql - optimal-blocks - optimusprime @@ -2132,11 +2237,9 @@ dont-distribute-packages: - orchid-demo - order-maintenance - org-mode-lucid - - OSM - osm-download - otp-authenticator - padKONTROL - - PageIO - pairing - panda - pandoc-japanese-filters @@ -2147,11 +2250,9 @@ dont-distribute-packages: - papa-implement - papa-semigroupoids - paprika - - Paraiso - - Parallel-Arrows-Eden - parco-attoparsec - - parconc-examples - parco-parsec + - parconc-examples - parquet-hs - parse-help - parsestar @@ -2164,7 +2265,6 @@ dont-distribute-packages: - pcapng - pcf - pcf-font-embed - - PCLT-DB - pdf-slave - peakachu - pec @@ -2181,7 +2281,6 @@ dont-distribute-packages: - periodic-client-exe - periodic-server - perm - - PermuteEffects - persistent-audit - persistent-hssqlppp - persistent-map @@ -2216,17 +2315,16 @@ dont-distribute-packages: - planet-mitchell - plocketed - ploterific - - Plot-ho-matic - - PlslTools - png-file - pngload - pocket-dns + - point-octree - pointless-lenses - pointless-rewrite - - point-octree - poke - polh-lexicon - polydata + - polysemy-RandomFu - polysemy-chronos - polysemy-conc - polysemy-extra @@ -2243,7 +2341,6 @@ dont-distribute-packages: - polysemy-optics - polysemy-path - polysemy-plugin - - polysemy-RandomFu - polysemy-readline - polysemy-resume - polysemy-test @@ -2277,15 +2374,13 @@ dont-distribute-packages: - powerqueue-sqs - pqueue-mtl - practice-room - - prednote-test - pred-set - pred-trie + - prednote-test - presto-hdbc - preview - primula-board - primula-bot - - Printf-TH - - ProbabilityMonads - proc - process-iterio - process-progress @@ -2303,19 +2398,16 @@ dont-distribute-packages: - proplang - prosidyc - proteome + - proto-lens-descriptors - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork - - proto-lens-descriptors - proton - psc-ide - puffytools - - Pugs - pugs-compat - pugs-hsregex - punkt - - Pup-Events - - Pup-Events-Demo - puppetresources - pure-cdb - pure-priority-queue-tests @@ -2332,7 +2424,6 @@ dont-distribute-packages: - qhs - qr-repa - quantum-random - - Quelea - queryparser - queryparser-demo - queryparser-hive @@ -2376,7 +2467,6 @@ dont-distribute-packages: - random-effin - random-hypergeometric - range-space - - Ranka - rasa - rasa-example-config - rasa-ext-bufs @@ -2409,10 +2499,10 @@ dont-distribute-packages: - record-aeson - record-gl - record-preprocessor - - records-th - record-syntax - - reddit + - records-th - redHandlers + - reddit - reduce-equations - refh - reflex-animation @@ -2428,8 +2518,8 @@ dont-distribute-packages: - regex-genex - regex-pcre-text - regex-pderiv - - regexp-tries - regex-xmlschema + - regexp-tries - regional-pointers - regions-monadsfd - regions-monadstf @@ -2462,15 +2552,14 @@ dont-distribute-packages: - rest-client - rest-core - rest-example - - restful-snap - rest-gen - rest-happstack - - RESTng - - restricted-workers - rest-snap - rest-stringmap - rest-types - rest-wai + - restful-snap + - restricted-workers - rethinkdb-model - rewrite - rewriting @@ -2490,16 +2579,8 @@ dont-distribute-packages: - ripple - risc-v - rivet - - Rlang-QQ - rlwe-challenges - rmonad - - RMP - - RNAdesign - - RNAdraw - - RNAFold - - RNAFoldProgs - - RNAlien - - RNAwolf - rncryptor - rob - robot @@ -2511,7 +2592,6 @@ dont-distribute-packages: - rollbar-cli - rollbar-wai - rollbar-yesod - - RollingDirectory - ron-schema - ron-storage - rose-trie @@ -2530,7 +2610,7 @@ dont-distribute-packages: - ruler - ruler-core - runtime-arbitrary - - S3 + - s-expression - safer-file-handles - safer-file-handles-bytestring - safer-file-handles-text @@ -2548,29 +2628,25 @@ dont-distribute-packages: - samtools-iteratee - sarsi - sasl + - sat-micro-hs - satchmo-backends - satchmo-examples - satchmo-funsat - satchmo-minisat - satchmo-toysat - - sat-micro-hs - - SBench - - sc2hs - sc2-lowlevel - sc2-support + - sc2hs - sc3-rdu - scalable-server - - SCalendar - - scalpel-search - scalp-webhooks + - scalpel-search - scan-vector-machine - schema - schematic - scholdoc - scholdoc-citeproc - scholdoc-texmath - - SciFlow - - SciFlow-drmaa - scion - scion-browser - scope @@ -2579,15 +2655,12 @@ dont-distribute-packages: - scp-streams - scrabble-bot - scrapbook - - SCRIPTWriter - - Scurry - sde-solver - seakale-postgresql - seakale-tests - secrm - sednaDBXML - seitz-symbol - - SelectSequencesFromMSA - selenium-server - self-extract - semi-iso @@ -2602,6 +2675,7 @@ dont-distribute-packages: - sequor - serpentine - serv + - serv-wai - servant-auth-token - servant-auth-token-acid - servant-auth-token-leveldb @@ -2630,12 +2704,7 @@ dont-distribute-packages: - servant-zeppelin-client - servant-zeppelin-server - servant-zeppelin-swagger - - serv-wai - sessiontypes-distributed - - s-expression - - SFML-control - - SFont - - SGdemo - sgf - sgrep - sha1 @@ -2644,27 +2713,13 @@ dont-distribute-packages: - shapefile - shapely-data - shelduck - - Shellac-compatline - - Shellac-editline - - Shellac-haskeline - - Shellac-readline - shellmate-extras - shine-varying - - ShortestPathProblems - showdown - - Shpadoinkle-backend-pardiff - - Shpadoinkle-backend-static - - Shpadoinkle-developer-tools - - Shpadoinkle-disembodied - - Shpadoinkle-examples - - Shpadoinkle-html - - Shpadoinkle-router - - Shpadoinkle-template - - Shpadoinkle-widgets - shpider - shuffle - - sibe - si-clock + - sibe - sigma-ij - signable - signals @@ -2674,12 +2729,9 @@ dont-distribute-packages: - simgi - simple-c-value - simple-firewire - - SimpleGL - - simpleirc-lens - - SimpleLog - simple-nix - simple-pascal - - SimpleServer + - simpleirc-lens - simseq - singleton-nats_0_4_6 - singletons-base @@ -2696,7 +2748,6 @@ dont-distribute-packages: - smcdel - smith-cli - smith-client - - Smooth - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck @@ -2705,6 +2756,7 @@ dont-distribute-packages: - snap-auth-cli - snap-elm - snap-extras + - snap-utils - snaplet-actionlog - snaplet-auth-acid - snaplet-coffee @@ -2727,17 +2779,13 @@ dont-distribute-packages: - snaplet-tasks - snaplet-wordpress - snappy-iteratee - - snap-utils - sndfile-enumerators - sneathlane-haste - snm - snmp + - snow-white - snowflake-core - snowflake-server - - snow-white - - Snusmumrik - - SoccerFun - - SoccerFunGL - sock2stream - sockets - solga-swagger @@ -2746,7 +2794,6 @@ dont-distribute-packages: - sounddelay - soundgen - source-code-server - - SourceGraph - sparkle - sparrow - sparsebit @@ -2761,49 +2808,41 @@ dont-distribute-packages: - sphero - sphinx-cli - spice - - SpinCounter - spline3 - splines - - Spock-auth - - Spock-lucid - - Spock-worker - sprinkles - sproxy - - sproxy2 - sproxy-web - - sqlite-simple-typed + - sproxy2 - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql - sql-simple-sqlite + - sqlite-simple-typed - sr-extra - sscgi - sshd-lint - sssp - sstable - stable-tree + - stack-hpc-coveralls + - stack-network + - stack-run-auto - stackage - - stackage2nix - stackage-build-plan - stackage-cabal - stackage-query - stackage-sandbox - stackage-setup - stackage-upload - - stack-hpc-coveralls - - stack-network - - stack-run-auto + - stackage2nix - starrover2 - stateful-mtl - static-closure - statsd-client - statsdi - - STLinkUSB - - STM32-Zombie - stmcontrol - - StockholmAlignment - storablevector-streamfusion - - Strafunski-Sdf2Haskell - stratux - stratux-demo - stratux-http @@ -2836,38 +2875,36 @@ dont-distribute-packages: - superconstraints - sv - sv-cassava - - svg2q - - SVG2Q - - svgone - sv-svfactor + - svg2q + - svgone - swapper - swearjure - sweet-egison - switch - sylvia + - sym-plot - symantic-atom - symantic-lib - symbiote - symmetry-operations-symbols - - sym-plot - syncthing-hs - syntax - syntax-attoparsec - syntax-example - syntax-example-json - - SyntaxMacros - - syntaxnet-haskell - syntax-pretty - syntax-printer + - syntaxnet-haskell - synthesizer-llvm - systemstats - t3-client - ta + - tag-stream - tagged-list - tagged-th - tagsoup-navigate - tagstew - - tag-stream - tal - tamarin-prover - tamarin-prover-term @@ -2882,15 +2919,12 @@ dont-distribute-packages: - tasty-laws - tasty-lens - tateti-tateti - - Taxonomy - - TaxonomyTools - tbox - tccli - tdd-util - tdlib - tdlib-gen - tdlib-types - - TeaHS - techlab - telegram-bot - telegram-raw-api @@ -2900,35 +2934,34 @@ dont-distribute-packages: - tensorflow-ops - terminal-text - terrahs - - testbench - test-framework-sandbox - test-sandbox-compose - test-sandbox-hunit - test-sandbox-quickcheck - test-simple - - TeX-my-math - - textmatetags + - testbench - text-plus - text-trie - text-xml-generic + - textmatetags - th-alpha - th-context + - th-instances + - th-typegraph - theatre - theoremquest-client - thimk - - th-instances - - th-typegraph - thumbnail-polish - - tickle - tic-tac-toe + - tickle - tidal-serial - tighttp - timberc - time-exts - time-http - time-io-access - - timeprint - time-warp + - timeprint - timezone-unix - tinyMesh - tip-haskell-frontend @@ -2936,13 +2969,13 @@ dont-distribute-packages: - titan - tls-extra - tn + - to-string-instances - toboggan - todos - toktok - too-many-cells - top - topkata - - to-string-instances - total-map - toxcore - toxcore-c @@ -2962,14 +2995,11 @@ dont-distribute-packages: - trasa-reflex - trasa-server - trasa-th - - TreeCounter - treemap-html-tools - treersec - - Treiber - trek-app - trek-db - triangulation - - TrieMap - tries - trimpolya - truelevel @@ -2996,22 +3026,20 @@ dont-distribute-packages: - type-assertions - type-cache - type-cereal - - TypeClass - type-combinators-quote - type-combinators-singletons - - typed-encoding-encoding - type-digits - - typed-spreadsheet - - typed-streams - - TypeIlluminator - - typelevel - - typelevel-rewrite-rules - type-ord - type-ord-spine-cereal - - typescript-docs - type-sets - type-structure - type-sub-th + - typed-encoding-encoding + - typed-spreadsheet + - typed-streams + - typelevel + - typelevel-rewrite-rules + - typescript-docs - typson-beam - typson-esqueleto - typson-selda @@ -3020,20 +3048,19 @@ dont-distribute-packages: - ucam-webauth - uhc-light - uhc-util - - UMM - unagi-bloomfilter - unbound - unfoldable-restricted - - unicode-normalization - uni-events - - uniformBase - - uniform-io - uni-graphs - uni-htk - uni-posixutil - - uniqueness-periods-vector-examples - uni-reactor - uni-uDrawGraph + - unicode-normalization + - uniform-io + - uniformBase + - uniqueness-periods-vector-examples - universe-th - unix-fcntl - unix-simple @@ -3049,8 +3076,6 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - UrlDisp - - URLT - usb - usb-enumerator - usb-hid @@ -3086,7 +3111,6 @@ dont-distribute-packages: - vformat-aeson - vformat-time - vfr-waypoints - - ViennaRNA-extras - vigilance - vimeta - vinyl-operational @@ -3114,26 +3138,18 @@ dont-distribute-packages: - wai-thrift - waldo - warped - - WashNGo - - WAVE - - WaveFront - wavesurfer - wavy - - web3 - - webapi - - WebBits-Html - - WebBits-multiplate - - WebCont - - webcrank-wai - - webdriver-w3c - web-mongrel2 - web-page - web-rep - web-routes-regular - web-routing + - web3 + - webapi + - webcrank-wai + - webdriver-w3c - webserver - - WEditorBrick - - WEditorHyphen - weighted - werewolf-slack - what4 @@ -3144,13 +3160,11 @@ dont-distribute-packages: - wikipedia4epub - windowslive - winio - - WL500gPControl - - wlc-hs - wl-pprint-ansiterm - wl-pprint-terminfo + - wlc-hs - wobsurv - wolf - - WordAlignment - workflow-extra - workflow-pure - workflow-types @@ -3161,28 +3175,23 @@ dont-distribute-packages: - writer-cps-full - wss-client - wtk-gtk + - wu-wei - wumpus-basic - wumpus-drawing - wumpus-microprint - wumpus-tree - - WURFL - - wu-wei - wx - wxAsteroids + - wxFruit + - wxSimpleCanvas - wxc - wxcore - - WXDiffCtrl - - wxFruit - - WxGeneric - wxhnotepad - - wxSimpleCanvas - wxturtle - wyvern - xdcc - xhb-atom-cache - xhb-ewmh - - XML - - xml2x - xml-catalog - xml-enumerator - xml-enumerator-combinators @@ -3191,34 +3200,31 @@ dont-distribute-packages: - xml-push - xml-query-xml-conduit - xml-query-xml-types - - xmltv - xml-tydom-conduit + - xml2x + - xmltv - xmms2-client - xmms2-client-glib - xmonad-contrib-bluetilebranch - xmpipe - - XMPP - xournal-builder - xournal-convert - xournal-parser - xournal-render - - XSaiga - xtc - - Yablog - - YACPong - yajl-enumerator - yam - yam-datasource - yam-job - yam-logger - - yaml-rpc-scotty - - yaml-rpc-snap - - yaml-unscrambler - yam-redis - yam-transaction - yam-transaction-odbc - yam-transaction-postgresql - yam-web + - yaml-rpc-scotty + - yaml-rpc-snap + - yaml-unscrambler - yarr-image-io - yavie - ycextra @@ -3241,15 +3247,12 @@ dont-distribute-packages: - yesod-session-redis - yjftp - yjftp-libs - - Yogurt - - Yogurt-Standalone - yoko - york-lava - yql - yu-launch - yuuko - zasni-gerna - - Z-Botan - zephyr - zerobin - zeromq3-conduit @@ -3261,16 +3264,13 @@ dont-distribute-packages: - zifter-hindent - zifter-hlint - zifter-stack - - Z-IO - zipper - zippo - ziptastic-client - zlib-enum - zmcat - - Z-MessagePack - zoom-cache - zoom-cache-pcm - zoom-cache-sndfile - zoovisitor - zuramaru - - Z-YAML From df8f2736d54dfc8eac8f648b05f87b5eac2c1241 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 30 Jun 2021 23:18:16 +0800 Subject: [PATCH 22/33] maintainers/scripts/haskell: clear environment while regenerating Also misc shellcheck fixes --- maintainers/scripts/haskell/mark-broken.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 58433abe662b..71568ef6f200 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -17,9 +17,9 @@ trap "rm ${tmpfile}" 0 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script." echo "Generating a list of broken builds and displaying for manual confirmation ..." -maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile +maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile" -$EDITOR $tmpfile +$EDITOR "$tmpfile" tail -n +3 "$broken_config" >> "$tmpfile" @@ -28,10 +28,11 @@ broken-packages: # These packages don't compile. EOF +# clear environment here to avoid things like allowing broken builds in sort -iu "$tmpfile" >> "$broken_config" -maintainers/scripts/haskell/regenerate-hackage-packages.sh -maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh -maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config From 67af267cf7e27c5d2f7ef33a5c9bd02df7bbf11c Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Wed, 30 Jun 2021 21:27:56 +0200 Subject: [PATCH 23/33] Update nixos/modules/config/shells-environment.nix lgtm Co-authored-by: Sandro --- nixos/modules/config/shells-environment.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index c0306bd03b64..5e5d75a91036 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -128,7 +128,7 @@ in environment.localBinInPath = mkOption { description = '' - Include ~/.local/bin/ in $PATH. + Add ~/.local/bin/ to $PATH ''; default = false; type = types.bool; From 55a211ae3184d105129f00da537c35e14197e300 Mon Sep 17 00:00:00 2001 From: Jacob Hrbek Date: Wed, 30 Jun 2021 21:32:08 +0200 Subject: [PATCH 24/33] Removed wrong comment --- nixos/modules/config/shells-environment.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 5e5d75a91036..34e558d8603d 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -208,7 +208,6 @@ in ''} ${optionalString cfg.localBinInPath '' - # ~/.local/bin if it exists overrides other bin directories. export PATH="$HOME/.local/bin:$PATH" ''} ''; From 5ec46687325f11c95d6f03a69fdd583ac11cc8d2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 1 Jul 2021 18:19:16 +0200 Subject: [PATCH 25/33] grafana: 8.0.3 -> 8.0.4 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.4 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 99acc52b9de2..14d0c63d90bf 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.3"; + version = "8.0.4"; excludedPackages = [ "release_publisher" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GGtmsz3c7Q6mEGCJ6cdz2CjOW0ovZZW8j6LMfFgrMZ4="; + sha256 = "sha256-I4TUPni2WDdpsV19nltsaF1PugB5SOtQ9Jb0YzWUwFg="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-2x0FhKinrXAFenJcUDh4Q3RJNBrqixKBNZT7BZNNOj8="; + sha256 = "sha256-GUVnw2kKxVfztvfsNMwRLxPTqRYzbxXzoH2GkmZB2JE="; }; vendorSha256 = "sha256-x7sSVIim/TOhMTbnRK/fpgxiSRSO8KwGILTE2i1gU3U="; From 355fc790548e26f93359f617c010a29b2dbb8e0b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 1 Jul 2021 21:01:42 +0200 Subject: [PATCH 26/33] foot: 1.8.0 -> 1.8.1 --- pkgs/applications/terminal-emulators/foot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index f69625e16cd0..4f8d6832eddd 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -26,7 +26,7 @@ }: let - version = "1.8.0"; + version = "1.8.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "07irlhkvziv51cp5zn1yz8ljfnrnfjcykv5pgfwmpslw3nl5szxv"; + sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989"; }; nativeBuildInputs = [ From 258e959faf55c76c1855b57ee26a97027a303c28 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Thu, 1 Jul 2021 20:47:08 -0300 Subject: [PATCH 27/33] lean: 3.30.0 -> 3.31.0 --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 214f4e218fd3..ea2cd356e315 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.30.0"; + version = "3.31.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a5822ea47ebc52eec6323d8f1b60f6ec025daf99"; - sha256 = "sha256-gJhbkl19iilNyfCt2TfPmghYA3yCjg6kS+yk/x/k14Y="; + rev = "333783350cd3fe38f25fed1da7d6a433d8f85b77"; + sha256 = "sha256-N8Ju7pSGssvt84/0e1o6G/p7fWM1c0Mzw+ftL1/++J4="; }; nativeBuildInputs = [ cmake ]; From 93e565b717966ae09ad6d54fac11d3081a23bf54 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 2 Jul 2021 18:35:55 +0800 Subject: [PATCH 28/33] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 2 ++ .../configuration-hackage2nix/transitive-broken.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 6 ++++++ 3 files changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 9720989eb5dd..f21266e5004d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2965,6 +2965,7 @@ broken-packages: - mi - miconix-test - microbase + - microformats2-parser - microgroove - microlens-each - micrologger @@ -3982,6 +3983,7 @@ broken-packages: - reversi - ReviewBoard - rewrite-inspector + - rfc - rfc-prelude - rhbzquery - ribbit diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3ab2585a9b4e..fdad31819ac5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -721,6 +721,7 @@ dont-distribute-packages: - clash-verilog - clash-vhdl - classify-frog + - classy-miso - clckwrks - clckwrks-cli - clckwrks-dot-com @@ -1723,6 +1724,7 @@ dont-distribute-packages: - indentation-parsec - indentation-trifecta - indexation + - indieweb-algorithms - infernu - inline-java - inspector-wrecker diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 439dd1d53327..4e8e61c05b08 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -55738,6 +55738,7 @@ self: { testHaskellDepends = [ base miso rfc ]; description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "classy-parallel" = callPackage @@ -147290,6 +147291,7 @@ self: { ]; description = "A collection of implementations of IndieWeb algorithms"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; }) {}; "indigo" = callPackage @@ -173802,6 +173804,8 @@ self: { ]; description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "microformats2-types" = callPackage @@ -223212,6 +223216,8 @@ self: { ]; description = "Robert Fischer's Common library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rfc-env" = callPackage From a1e039f34093d1311dd770250e76d74613dc505a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Fri, 2 Jul 2021 14:05:35 +0300 Subject: [PATCH 29/33] =?UTF-8?q?gopass:=201.12.6=20=E2=86=92=201.12.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/security/gopass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index dea65ca7164c..358acf376b48 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.6"; + version = "1.12.7"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "17y9indpgqqx261bqvckfqq1q2zciahssaalaa5c5hb6bnw5ls52"; + sha256 = "08mzm03vhc8pqyl17y8dkrcpgy3ckmb84x84b6ap3cja3y8gmj5x"; }; - vendorSha256 = "106rn0bkvzf2fw21f6wpiya88ysj8sfc2zkkm47iqr23d2202i4b"; + vendorSha256 = "0ym6f1h51bj3qlzxs936fz3p47l63nad4xckl16m13iy0k7z5flg"; subPackages = [ "." ]; From 163976c296a3ba07680b524855b1762c77a15249 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 20:22:58 +0800 Subject: [PATCH 30/33] nixos: nixos/doc/manual/development/writing-nixos-tests.xml to CommonMark --- nixos/doc/manual/development/nixos-tests.xml | 2 +- .../writing-nixos-tests.section.md | 301 ++++++++++ .../development/writing-nixos-tests.xml | 517 ----------------- .../writing-nixos-tests.section.xml | 526 ++++++++++++++++++ 4 files changed, 828 insertions(+), 518 deletions(-) create mode 100644 nixos/doc/manual/development/writing-nixos-tests.section.md delete mode 100644 nixos/doc/manual/development/writing-nixos-tests.xml create mode 100644 nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index 2695082e3867..77b7595431ea 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -13,7 +13,7 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test one or more virtual machines containing the NixOS system(s) required for the test. - + diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md new file mode 100644 index 000000000000..8471e7608af9 --- /dev/null +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -0,0 +1,301 @@ +# Writing Tests {#sec-writing-nixos-tests} + +A NixOS test is a Nix expression that has the following structure: + +```nix +import ./make-test-python.nix { + + # Either the configuration of a single machine: + machine = + { config, pkgs, ... }: + { configuration… + }; + + # Or a set of machines: + nodes = + { machine1 = + { config, pkgs, ... }: { … }; + machine2 = + { config, pkgs, ... }: { … }; + … + }; + + testScript = + '' + Python code… + ''; +} +``` + +The attribute `testScript` is a bit of Python code that executes the +test (described below). During the test, it will start one or more +virtual machines, the configuration of which is described by the +attribute `machine` (if you need only one machine in your test) or by +the attribute `nodes` (if you need multiple machines). For instance, +[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix) +only needs a single machine to test whether users can log in +on the virtual console, whether device ownership is correctly maintained +when switching between consoles, and so on. On the other hand, +[`nfs/simple.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix), +which tests NFS client and server functionality in the +Linux kernel (including whether locks are maintained across server +crashes), requires three machines: a server and two clients. + +There are a few special NixOS configuration options for test VMs: + +`virtualisation.memorySize` + +: The memory of the VM in megabytes. + +`virtualisation.vlans` + +: The virtual networks to which the VM is connected. See + [`nat.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix) + for an example. + +`virtualisation.writableStore` + +: By default, the Nix store in the VM is not writable. If you enable + this option, a writable union file system is mounted on top of the + Nix store to make it appear writable. This is necessary for tests + that run Nix operations that modify the store. + +For more options, see the module +[`qemu-vm.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix). + +The test script is a sequence of Python statements that perform various +actions, such as starting VMs, executing commands in the VMs, and so on. +Each virtual machine is represented as an object stored in the variable +`name` if this is also the identifier of the machine in the declarative +config. If you didn\'t specify multiple machines using the `nodes` +attribute, it is just `machine`. The following example starts the +machine, waits until it has finished booting, then executes a command +and checks that the output is more-or-less correct: + +```py +machine.start() +machine.wait_for_unit("default.target") +if not "Linux" in machine.succeed("uname"): + raise Exception("Wrong OS") +``` + +The first line is actually unnecessary; machines are implicitly started +when you first execute an action on them (such as `wait_for_unit` or +`succeed`). If you have multiple machines, you can speed up the test by +starting them in parallel: + +```py +start_all() +``` + +The following methods are available on machine objects: + +`start` + +: Start the virtual machine. This method is asynchronous --- it does + not wait for the machine to finish booting. + +`shutdown` + +: Shut down the machine, waiting for the VM to exit. + +`crash` + +: Simulate a sudden power failure, by telling the VM to exit + immediately. + +`block` + +: Simulate unplugging the Ethernet cable that connects the machine to + the other machines. + +`unblock` + +: Undo the effect of `block`. + +`screenshot` + +: Take a picture of the display of the virtual machine, in PNG format. + The screenshot is linked from the HTML log. + +`get_screen_text_variants` + +: Return a list of different interpretations of what is currently + visible on the machine\'s screen using optical character + recognition. The number and order of the interpretations is not + specified and is subject to change, but if no exception is raised at + least one will be returned. + + ::: {.note} + This requires passing `enableOCR` to the test attribute set. + ::: + +`get_screen_text` + +: Return a textual representation of what is currently visible on the + machine\'s screen using optical character recognition. + + ::: {.note} + This requires passing `enableOCR` to the test attribute set. + ::: + +`send_monitor_command` + +: Send a command to the QEMU monitor. This is rarely used, but allows + doing stuff such as attaching virtual USB disks to a running + machine. + +`send_key` + +: Simulate pressing keys on the virtual keyboard, e.g., + `send_key("ctrl-alt-delete")`. + +`send_chars` + +: Simulate typing a sequence of characters on the virtual keyboard, + e.g., `send_chars("foobar\n")` will type the string `foobar` + followed by the Enter key. + +`execute` + +: Execute a shell command, returning a list `(status, stdout)`. + +`succeed` + +: Execute a shell command, raising an exception if the exit status is + not zero, otherwise returning the standard output. Commands are run + with `set -euo pipefail` set: + + - If several commands are separated by `;` and one fails, the + command as a whole will fail. + + - For pipelines, the last non-zero exit status will be returned + (if there is one, zero will be returned otherwise). + + - Dereferencing unset variables fail the command. + +`fail` + +: Like `succeed`, but raising an exception if the command returns a zero + status. + +`wait_until_succeeds` + +: Repeat a shell command with 1-second intervals until it succeeds. + +`wait_until_fails` + +: Repeat a shell command with 1-second intervals until it fails. + +`wait_for_unit` + +: Wait until the specified systemd unit has reached the "active" + state. + +`wait_for_file` + +: Wait until the specified file exists. + +`wait_for_open_port` + +: Wait until a process is listening on the given TCP port (on + `localhost`, at least). + +`wait_for_closed_port` + +: Wait until nobody is listening on the given TCP port. + +`wait_for_x` + +: Wait until the X11 server is accepting connections. + +`wait_for_text` + +: Wait until the supplied regular expressions matches the textual + contents of the screen by using optical character recognition (see + `get_screen_text` and `get_screen_text_variants`). + + ::: {.note} + This requires passing `enableOCR` to the test attribute set. + ::: + +`wait_for_console_text` + +: Wait until the supplied regular expressions match a line of the + serial console output. This method is useful when OCR is not + possibile or accurate enough. + +`wait_for_window` + +: Wait until an X11 window has appeared whose name matches the given + regular expression, e.g., `wait_for_window("Terminal")`. + +`copy_from_host` + +: Copies a file from host to machine, e.g., + `copy_from_host("myfile", "/etc/my/important/file")`. + + The first argument is the file on the host. The file needs to be + accessible while building the nix derivation. The second argument is + the location of the file on the machine. + +`systemctl` + +: Runs `systemctl` commands with optional support for + `systemctl --user` + + ```py + machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` + machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` + ``` + +`shell_interact` + +: Allows you to directly interact with the guest shell. This should + only be used during test development, not in production tests. + Killing the interactive session with `Ctrl-d` or `Ctrl-c` also ends + the guest session. + +To test user units declared by `systemd.user.services` the optional +`user` argument can be used: + +```py +machine.start() +machine.wait_for_x() +machine.wait_for_unit("xautolock.service", "x-session-user") +``` + +This applies to `systemctl`, `get_unit_info`, `wait_for_unit`, +`start_job` and `stop_job`. + +For faster dev cycles it\'s also possible to disable the code-linters +(this shouldn\'t be commited though): + +```nix +import ./make-test-python.nix { + skipLint = true; + machine = + { config, pkgs, ... }: + { configuration… + }; + + testScript = + '' + Python code… + ''; +} +``` + +This will produce a Nix warning at evaluation time. To fully disable the +linter, wrap the test script in comment directives to disable the Black +linter directly (again, don\'t commit this within the Nixpkgs +repository): + +```nix + testScript = + '' + # fmt: off + Python code… + # fmt: on + ''; +``` diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml deleted file mode 100644 index e372c66410de..000000000000 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ /dev/null @@ -1,517 +0,0 @@ -
- Writing Tests - - - A NixOS test is a Nix expression that has the following structure: - -import ./make-test-python.nix { - - # Either the configuration of a single machine: - machine = - { config, pkgs, ... }: - { configuration… - }; - - # Or a set of machines: - nodes = - { machine1 = - { config, pkgs, ... }: { … }; - machine2 = - { config, pkgs, ... }: { … }; - … - }; - - testScript = - '' - Python code… - ''; -} - - The attribute testScript is a bit of Python code that - executes the test (described below). During the test, it will start one or - more virtual machines, the configuration of which is described by the - attribute machine (if you need only one machine in your - test) or by the attribute nodes (if you need multiple - machines). For instance, - login.nix - only needs a single machine to test whether users can log in on the virtual - console, whether device ownership is correctly maintained when switching - between consoles, and so on. On the other hand, - nfs/simple.nix, - which tests NFS client and server functionality in the Linux kernel - (including whether locks are maintained across server crashes), requires - three machines: a server and two clients. - - - - There are a few special NixOS configuration options for test VMs: - - - - - - - - - The memory of the VM in megabytes. - - - - - - - - - - The virtual networks to which the VM is connected. See - nat.nix - for an example. - - - - - - - - - - By default, the Nix store in the VM is not writable. If you enable this - option, a writable union file system is mounted on top of the Nix store - to make it appear writable. This is necessary for tests that run Nix - operations that modify the store. - - - - - For more options, see the module - qemu-vm.nix. - - - - The test script is a sequence of Python statements that perform various - actions, such as starting VMs, executing commands in the VMs, and so on. Each - virtual machine is represented as an object stored in the variable - name if this is also the - identifier of the machine in the declarative config. - If you didn't specify multiple machines using the nodes - attribute, it is just machine. - The following example starts the machine, waits until it has finished booting, - then executes a command and checks that the output is more-or-less correct: - -machine.start() -machine.wait_for_unit("default.target") -if not "Linux" in machine.succeed("uname"): - raise Exception("Wrong OS") - - The first line is actually unnecessary; machines are implicitly started when - you first execute an action on them (such as wait_for_unit - or succeed). If you have multiple machines, you can speed - up the test by starting them in parallel: - -start_all() - - - - - The following methods are available on machine objects: - - - - start - - - - Start the virtual machine. This method is asynchronous — it does not - wait for the machine to finish booting. - - - - - - shutdown - - - - Shut down the machine, waiting for the VM to exit. - - - - - - crash - - - - Simulate a sudden power failure, by telling the VM to exit immediately. - - - - - - block - - - - Simulate unplugging the Ethernet cable that connects the machine to the - other machines. - - - - - - unblock - - - - Undo the effect of block. - - - - - - screenshot - - - - Take a picture of the display of the virtual machine, in PNG format. The - screenshot is linked from the HTML log. - - - - - - get_screen_text_variants - - - - Return a list of different interpretations of what is currently visible - on the machine's screen using optical character recognition. The number - and order of the interpretations is not specified and is subject to - change, but if no exception is raised at least one will be returned. - - - - This requires passing to the test attribute - set. - - - - - - - get_screen_text - - - - Return a textual representation of what is currently visible on the - machine's screen using optical character recognition. - - - - This requires passing to the test attribute - set. - - - - - - - send_monitor_command - - - - Send a command to the QEMU monitor. This is rarely used, but allows doing - stuff such as attaching virtual USB disks to a running machine. - - - - - - send_key - - - - Simulate pressing keys on the virtual keyboard, e.g., - send_key("ctrl-alt-delete"). - - - - - - send_chars - - - - Simulate typing a sequence of characters on the virtual keyboard, e.g., - send_chars("foobar\n") will type the string - foobar followed by the Enter key. - - - - - - execute - - - - Execute a shell command, returning a list - (status, - stdout). - - - - - - succeed - - - - Execute a shell command, raising an exception if the exit status - is not zero, otherwise returning the standard output. Commands - are run with set -euo pipefail set: - - - - If several commands are separated by ; - and one fails, the command as a whole will fail. - - - - - For pipelines, the last non-zero exit status will be - returned (if there is one, zero will be returned - otherwise). - - - - - Dereferencing unset variables fail the command. - - - - - - - - - fail - - - - Like succeed, but raising an exception if the - command returns a zero status. - - - - - - wait_until_succeeds - - - - Repeat a shell command with 1-second intervals until it succeeds. - - - - - - wait_until_fails - - - - Repeat a shell command with 1-second intervals until it fails. - - - - - - wait_for_unit - - - - Wait until the specified systemd unit has reached the “active” state. - - - - - - wait_for_file - - - - Wait until the specified file exists. - - - - - - wait_for_open_port - - - - Wait until a process is listening on the given TCP port (on - localhost, at least). - - - - - - wait_for_closed_port - - - - Wait until nobody is listening on the given TCP port. - - - - - - wait_for_x - - - - Wait until the X11 server is accepting connections. - - - - - - wait_for_text - - - - Wait until the supplied regular expressions matches the textual contents - of the screen by using optical character recognition (see - get_screen_text and - get_screen_text_variants). - - - - This requires passing to the test attribute - set. - - - - - - - wait_for_console_text - - - - Wait until the supplied regular expressions match a line of the serial - console output. This method is useful when OCR is not possibile or - accurate enough. - - - - - - wait_for_window - - - - Wait until an X11 window has appeared whose name matches the given - regular expression, e.g., wait_for_window("Terminal"). - - - - - - copy_from_host - - - - Copies a file from host to machine, e.g., - copy_from_host("myfile", "/etc/my/important/file"). - - - The first argument is the file on the host. The file needs to be - accessible while building the nix derivation. The second argument is the - location of the file on the machine. - - - - - - systemctl - - - - Runs systemctl commands with optional support for - systemctl --user - - - -machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` -machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` - - - - - - - shell_interact - - - - Allows you to directly interact with the guest shell. - This should only be used during test development, not in production tests. - Killing the interactive session with Ctrl-d or Ctrl-c also ends the guest session. - - - - - - - - To test user units declared by systemd.user.services the - optional user argument can be used: - -machine.start() -machine.wait_for_x() -machine.wait_for_unit("xautolock.service", "x-session-user") - - This applies to systemctl, get_unit_info, - wait_for_unit, start_job and - stop_job. - - - - For faster dev cycles it's also possible to disable the code-linters (this shouldn't - be commited though): - -import ./make-test-python.nix { - skipLint = true; - machine = - { config, pkgs, ... }: - { configuration… - }; - - testScript = - '' - Python code… - ''; -} - - This will produce a Nix warning at evaluation time. To fully disable the - linter, wrap the test script in comment directives to disable the Black linter - directly (again, don't commit this within the Nixpkgs repository): - - testScript = - '' - # fmt: off - Python code… - # fmt: on - ''; - - -
diff --git a/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml new file mode 100644 index 000000000000..83a96d5bb224 --- /dev/null +++ b/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -0,0 +1,526 @@ +
+ Writing Tests + + A NixOS test is a Nix expression that has the following structure: + + +import ./make-test-python.nix { + + # Either the configuration of a single machine: + machine = + { config, pkgs, ... }: + { configuration… + }; + + # Or a set of machines: + nodes = + { machine1 = + { config, pkgs, ... }: { … }; + machine2 = + { config, pkgs, ... }: { … }; + … + }; + + testScript = + '' + Python code… + ''; +} + + + The attribute testScript is a bit of Python code + that executes the test (described below). During the test, it will + start one or more virtual machines, the configuration of which is + described by the attribute machine (if you need + only one machine in your test) or by the attribute + nodes (if you need multiple machines). For + instance, + login.nix + only needs a single machine to test whether users can log in on the + virtual console, whether device ownership is correctly maintained + when switching between consoles, and so on. On the other hand, + nfs/simple.nix, + which tests NFS client and server functionality in the Linux kernel + (including whether locks are maintained across server crashes), + requires three machines: a server and two clients. + + + There are a few special NixOS configuration options for test VMs: + + + + + virtualisation.memorySize + + + + The memory of the VM in megabytes. + + + + + + virtualisation.vlans + + + + The virtual networks to which the VM is connected. See + nat.nix + for an example. + + + + + + virtualisation.writableStore + + + + By default, the Nix store in the VM is not writable. If you + enable this option, a writable union file system is mounted on + top of the Nix store to make it appear writable. This is + necessary for tests that run Nix operations that modify the + store. + + + + + + For more options, see the module + qemu-vm.nix. + + + The test script is a sequence of Python statements that perform + various actions, such as starting VMs, executing commands in the + VMs, and so on. Each virtual machine is represented as an object + stored in the variable name if this is also the + identifier of the machine in the declarative config. If you didn't + specify multiple machines using the nodes + attribute, it is just machine. The following + example starts the machine, waits until it has finished booting, + then executes a command and checks that the output is more-or-less + correct: + + +machine.start() +machine.wait_for_unit("default.target") +if not "Linux" in machine.succeed("uname"): + raise Exception("Wrong OS") + + + The first line is actually unnecessary; machines are implicitly + started when you first execute an action on them (such as + wait_for_unit or succeed). If + you have multiple machines, you can speed up the test by starting + them in parallel: + + +start_all() + + + The following methods are available on machine objects: + + + + + start + + + + Start the virtual machine. This method is asynchronous — it + does not wait for the machine to finish booting. + + + + + + shutdown + + + + Shut down the machine, waiting for the VM to exit. + + + + + + crash + + + + Simulate a sudden power failure, by telling the VM to exit + immediately. + + + + + + block + + + + Simulate unplugging the Ethernet cable that connects the + machine to the other machines. + + + + + + unblock + + + + Undo the effect of block. + + + + + + screenshot + + + + Take a picture of the display of the virtual machine, in PNG + format. The screenshot is linked from the HTML log. + + + + + + get_screen_text_variants + + + + Return a list of different interpretations of what is + currently visible on the machine's screen using optical + character recognition. The number and order of the + interpretations is not specified and is subject to change, but + if no exception is raised at least one will be returned. + + + + This requires passing enableOCR to the + test attribute set. + + + + + + + get_screen_text + + + + Return a textual representation of what is currently visible + on the machine's screen using optical character recognition. + + + + This requires passing enableOCR to the + test attribute set. + + + + + + + send_monitor_command + + + + Send a command to the QEMU monitor. This is rarely used, but + allows doing stuff such as attaching virtual USB disks to a + running machine. + + + + + + send_key + + + + Simulate pressing keys on the virtual keyboard, e.g., + send_key("ctrl-alt-delete"). + + + + + + send_chars + + + + Simulate typing a sequence of characters on the virtual + keyboard, e.g., + send_chars("foobar\n") will type + the string foobar followed by the Enter + key. + + + + + + execute + + + + Execute a shell command, returning a list + (status, stdout). + + + + + + succeed + + + + Execute a shell command, raising an exception if the exit + status is not zero, otherwise returning the standard output. + Commands are run with set -euo pipefail + set: + + + + + If several commands are separated by ; + and one fails, the command as a whole will fail. + + + + + For pipelines, the last non-zero exit status will be + returned (if there is one, zero will be returned + otherwise). + + + + + Dereferencing unset variables fail the command. + + + + + + + + fail + + + + Like succeed, but raising an exception if + the command returns a zero status. + + + + + + wait_until_succeeds + + + + Repeat a shell command with 1-second intervals until it + succeeds. + + + + + + wait_until_fails + + + + Repeat a shell command with 1-second intervals until it fails. + + + + + + wait_for_unit + + + + Wait until the specified systemd unit has reached the + active state. + + + + + + wait_for_file + + + + Wait until the specified file exists. + + + + + + wait_for_open_port + + + + Wait until a process is listening on the given TCP port (on + localhost, at least). + + + + + + wait_for_closed_port + + + + Wait until nobody is listening on the given TCP port. + + + + + + wait_for_x + + + + Wait until the X11 server is accepting connections. + + + + + + wait_for_text + + + + Wait until the supplied regular expressions matches the + textual contents of the screen by using optical character + recognition (see get_screen_text and + get_screen_text_variants). + + + + This requires passing enableOCR to the + test attribute set. + + + + + + + wait_for_console_text + + + + Wait until the supplied regular expressions match a line of + the serial console output. This method is useful when OCR is + not possibile or accurate enough. + + + + + + wait_for_window + + + + Wait until an X11 window has appeared whose name matches the + given regular expression, e.g., + wait_for_window("Terminal"). + + + + + + copy_from_host + + + + Copies a file from host to machine, e.g., + copy_from_host("myfile", "/etc/my/important/file"). + + + The first argument is the file on the host. The file needs to + be accessible while building the nix derivation. The second + argument is the location of the file on the machine. + + + + + + systemctl + + + + Runs systemctl commands with optional + support for systemctl --user + + +machine.systemctl("list-jobs --no-pager") # runs `systemctl list-jobs --no-pager` +machine.systemctl("list-jobs --no-pager", "any-user") # spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager` + + + + + + shell_interact + + + + Allows you to directly interact with the guest shell. This + should only be used during test development, not in production + tests. Killing the interactive session with + Ctrl-d or Ctrl-c also + ends the guest session. + + + + + + To test user units declared by + systemd.user.services the optional + user argument can be used: + + +machine.start() +machine.wait_for_x() +machine.wait_for_unit("xautolock.service", "x-session-user") + + + This applies to systemctl, + get_unit_info, wait_for_unit, + start_job and stop_job. + + + For faster dev cycles it's also possible to disable the code-linters + (this shouldn't be commited though): + + +import ./make-test-python.nix { + skipLint = true; + machine = + { config, pkgs, ... }: + { configuration… + }; + + testScript = + '' + Python code… + ''; +} + + + This will produce a Nix warning at evaluation time. To fully disable + the linter, wrap the test script in comment directives to disable + the Black linter directly (again, don't commit this within the + Nixpkgs repository): + + + testScript = + '' + # fmt: off + Python code… + # fmt: on + ''; + +
From 8fafcfa3ea8730b9e265fd0d4f605fd86897b116 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 20:23:38 +0800 Subject: [PATCH 31/33] nixos: nixos/doc/manual/development/running-nixos-tests.xml to CommonMark --- nixos/doc/manual/development/nixos-tests.xml | 2 +- .../running-nixos-tests.section.md | 31 ++++++++++++++++ .../development/running-nixos-tests.xml | 36 ------------------- .../running-nixos-tests.section.xml | 34 ++++++++++++++++++ 4 files changed, 66 insertions(+), 37 deletions(-) create mode 100644 nixos/doc/manual/development/running-nixos-tests.section.md delete mode 100644 nixos/doc/manual/development/running-nixos-tests.xml create mode 100644 nixos/doc/manual/from_md/development/running-nixos-tests.section.xml diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index 77b7595431ea..834a321ec4c6 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -14,6 +14,6 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test test. - + diff --git a/nixos/doc/manual/development/running-nixos-tests.section.md b/nixos/doc/manual/development/running-nixos-tests.section.md new file mode 100644 index 000000000000..d6a456f01883 --- /dev/null +++ b/nixos/doc/manual/development/running-nixos-tests.section.md @@ -0,0 +1,31 @@ +# Running Tests {#sec-running-nixos-tests} + +You can run tests using `nix-build`. For example, to run the test +[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix), +you just do: + +```ShellSession +$ nix-build '' +``` + +or, if you don't want to rely on `NIX_PATH`: + +```ShellSession +$ cd /my/nixpkgs/nixos/tests +$ nix-build login.nix +… +running the VM test script +machine: QEMU running (pid 8841) +… +6 out of 6 tests succeeded +``` + +After building/downloading all required dependencies, this will perform +a build that starts a QEMU/KVM virtual machine containing a NixOS +system. The virtual machine mounts the Nix store of the host; this makes +VM creation very fast, as no disk image needs to be created. Afterwards, +you can view a pretty-printed log of the test: + +```ShellSession +$ firefox result/log.html +``` diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml deleted file mode 100644 index e9257c907daf..000000000000 --- a/nixos/doc/manual/development/running-nixos-tests.xml +++ /dev/null @@ -1,36 +0,0 @@ -
- Running Tests - - - You can run tests using nix-build. For example, to run the - test - login.nix, - you just do: - -$ nix-build '<nixpkgs/nixos/tests/login.nix>' - - or, if you don’t want to rely on NIX_PATH: - -$ cd /my/nixpkgs/nixos/tests -$ nix-build login.nix -… -running the VM test script -machine: QEMU running (pid 8841) -… -6 out of 6 tests succeeded - - After building/downloading all required dependencies, this will perform a - build that starts a QEMU/KVM virtual machine containing a NixOS system. The - virtual machine mounts the Nix store of the host; this makes VM creation very - fast, as no disk image needs to be created. Afterwards, you can view a - pretty-printed log of the test: - -$ firefox result/log.html - - -
diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml new file mode 100644 index 000000000000..7159b95b22b0 --- /dev/null +++ b/nixos/doc/manual/from_md/development/running-nixos-tests.section.xml @@ -0,0 +1,34 @@ +
+ Running Tests + + You can run tests using nix-build. For example, + to run the test + login.nix, + you just do: + + +$ nix-build '<nixpkgs/nixos/tests/login.nix>' + + + or, if you don’t want to rely on NIX_PATH: + + +$ cd /my/nixpkgs/nixos/tests +$ nix-build login.nix +… +running the VM test script +machine: QEMU running (pid 8841) +… +6 out of 6 tests succeeded + + + After building/downloading all required dependencies, this will + perform a build that starts a QEMU/KVM virtual machine containing a + NixOS system. The virtual machine mounts the Nix store of the host; + this makes VM creation very fast, as no disk image needs to be + created. Afterwards, you can view a pretty-printed log of the test: + + +$ firefox result/log.html + +
From 47fe2c7e935b03e7788f4db1935b0527af370a09 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 2 Jul 2021 20:24:02 +0800 Subject: [PATCH 32/33] nixos: nixos/doc/manual/development/running-nixos-tests-interactively.xml to CommonMark --- nixos/doc/manual/development/nixos-tests.xml | 2 +- ...nning-nixos-tests-interactively.section.md | 44 ++++++++++++++++ .../running-nixos-tests-interactively.xml | 49 ------------------ ...ning-nixos-tests-interactively.section.xml | 50 +++++++++++++++++++ 4 files changed, 95 insertions(+), 50 deletions(-) create mode 100644 nixos/doc/manual/development/running-nixos-tests-interactively.section.md delete mode 100644 nixos/doc/manual/development/running-nixos-tests-interactively.xml create mode 100644 nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml index 834a321ec4c6..702fc03f6686 100644 --- a/nixos/doc/manual/development/nixos-tests.xml +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -15,5 +15,5 @@ xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/test - + diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md new file mode 100644 index 000000000000..3ba4e16e77f4 --- /dev/null +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -0,0 +1,44 @@ +# Running Tests interactively {#sec-running-nixos-tests-interactively} + +The test itself can be run interactively. This is particularly useful +when developing or debugging a test: + +```ShellSession +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-test-driver +starting VDE switch for network 1 +> +``` + +You can then take any Python statement, e.g. + +```py +> start_all() +> test_script() +> machine.succeed("touch /tmp/foo") +> print(machine.succeed("pwd")) # Show stdout of command +``` + +The function `test_script` executes the entire test script and drops you +back into the test driver command line upon its completion. This allows +you to inspect the state of the VMs after the test (e.g. to debug the +test script). + +To just start and experiment with the VMs, run: + +```ShellSession +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-run-vms +``` + +The script `nixos-run-vms` starts the virtual machines defined by test. + +You can re-use the VM states coming from a previous run by setting the +`--keep-vm-state` flag. + +```ShellSession +$ ./result/bin/nixos-run-vms --keep-vm-state +``` + +The machine state is stored in the `$TMPDIR/vm-state-machinename` +directory. diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml deleted file mode 100644 index a6044d5f89e8..000000000000 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml +++ /dev/null @@ -1,49 +0,0 @@ -
- Running Tests interactively - - - The test itself can be run interactively. This is particularly useful when - developing or debugging a test: - -$ nix-build nixos/tests/login.nix -A driverInteractive -$ ./result/bin/nixos-test-driver -starting VDE switch for network 1 -> - - You can then take any Python statement, e.g. - -> start_all() -> test_script() -> machine.succeed("touch /tmp/foo") -> print(machine.succeed("pwd")) # Show stdout of command - - The function test_script executes the entire test script - and drops you back into the test driver command line upon its completion. - This allows you to inspect the state of the VMs after the test (e.g. to debug - the test script). - - - - To just start and experiment with the VMs, run: - -$ nix-build nixos/tests/login.nix -A driverInteractive -$ ./result/bin/nixos-run-vms - - The script nixos-run-vms starts the virtual machines - defined by test. - - - - You can re-use the VM states coming from a previous run - by setting the --keep-vm-state flag. - -$ ./result/bin/nixos-run-vms --keep-vm-state - - The machine state is stored in the - $TMPDIR/vm-state-machinename directory. - -
diff --git a/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml new file mode 100644 index 000000000000..a2030e9c0739 --- /dev/null +++ b/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml @@ -0,0 +1,50 @@ +
+ Running Tests interactively + + The test itself can be run interactively. This is particularly + useful when developing or debugging a test: + + +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-test-driver +starting VDE switch for network 1 +> + + + You can then take any Python statement, e.g. + + +> start_all() +> test_script() +> machine.succeed("touch /tmp/foo") +> print(machine.succeed("pwd")) # Show stdout of command + + + The function test_script executes the entire test + script and drops you back into the test driver command line upon its + completion. This allows you to inspect the state of the VMs after + the test (e.g. to debug the test script). + + + To just start and experiment with the VMs, run: + + +$ nix-build nixos/tests/login.nix -A driverInteractive +$ ./result/bin/nixos-run-vms + + + The script nixos-run-vms starts the virtual + machines defined by test. + + + You can re-use the VM states coming from a previous run by setting + the --keep-vm-state flag. + + +$ ./result/bin/nixos-run-vms --keep-vm-state + + + The machine state is stored in the + $TMPDIR/vm-state-machinename directory. + +
From 7b39311bb25a4321c0756f1dfc13fd3456ea4e90 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 2 Jul 2021 18:44:43 +0200 Subject: [PATCH 33/33] seatd: Fix cross-compilation --- pkgs/applications/misc/seatd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index e07356d0c334..98f278e0c3a7 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "man" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ systemd ];