From 72ab382fb6b729b0d654f2c03f5eb25b39f11fbb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Apr 2021 04:20:00 +0000 Subject: [PATCH 01/57] postgresql_9_5: drop PostgreSQL 9.5 has reached EOL on February 11, 2021. See https://www.postgresql.org/support/versioning/ --- nixos/doc/manual/release-notes/rl-2105.xml | 5 +++++ nixos/modules/services/databases/postgresql.nix | 3 +-- pkgs/servers/sql/postgresql/default.nix | 9 --------- pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 1 - 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index ace1bdccdc6f..4ead00cf8903 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -948,6 +948,11 @@ environment.systemPackages = [ boot.extraSystemdUnitPaths list. + + + PostgreSQL 9.5 is scheduled EOL during the 21.05 life cycle and has been removed. + + diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index ee8cdf2d285f..fdc05312ece0 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -295,8 +295,7 @@ in # systems! mkDefault (if versionAtLeast config.system.stateVersion "20.03" then pkgs.postgresql_11 else if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql_9_6 - else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql_9_5 - else throw "postgresql_9_4 was removed, please upgrade your postgresql version."); + else throw "postgresql_9_5 was removed, please upgrade your postgresql version."); services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index d3cc2304c63b..35b46c673f83 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -191,15 +191,6 @@ let in self: { - postgresql_9_5 = self.callPackage generic { - version = "9.5.25"; - psqlSchema = "9.5"; - sha256 = "00yny0sskxrqk4ji2phgv3iqxd1aiy6rh660k73s4s1pn9gcaa3n"; - this = self.postgresql_9_5; - thisAttr = "postgresql_9_5"; - inherit self; - }; - postgresql_9_6 = self.callPackage generic { version = "9.6.21"; psqlSchema = "9.6"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d05c81dcaa9f..01257162a5af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -552,7 +552,6 @@ mapAliases ({ pmtools = acpica-tools; # added 2018-11-01 polarssl = mbedtls; # added 2018-04-25 poppler_qt5 = libsForQt5.poppler; # added 2015-12-19 - postgresql95 = postgresql_9_5; postgresql96 = postgresql_9_6; postgresql100 = throw "postgresql100 was deprecated on 2018-10-21: use postgresql_10 instead"; # postgresql plugins diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d009d82b156..752e9fdc1450 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18931,7 +18931,6 @@ in timescaledb-tune = callPackage ../development/tools/database/timescaledb-tune { }; inherit (import ../servers/sql/postgresql pkgs) - postgresql_9_5 postgresql_9_6 postgresql_10 postgresql_11 From 9375b5c7298e9fef1d11327715368a31de342593 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Apr 2021 20:51:27 +0200 Subject: [PATCH 02/57] Stackage Nightly 2021-04-06 --- .../configuration-hackage2nix.yaml | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 62285754cd8e..e3e3d65da01a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -99,7 +99,7 @@ default-package-overrides: - gi-secret < 0.0.13 - gi-vte < 2.91.28 - # Stackage Nightly 2021-04-02 + # Stackage Nightly 2021-04-06 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -330,7 +330,7 @@ default-package-overrides: - bech32 ==1.1.0 - bech32-th ==1.0.2 - bench ==1.0.12 - - benchpress ==0.2.2.15 + - benchpress ==0.2.2.16 - between ==0.11.0.0 - bibtex ==0.1.0.6 - bifunctors ==5.5.10 @@ -381,7 +381,7 @@ default-package-overrides: - boolsimplifier ==0.1.8 - boots ==0.2.0.1 - bordacount ==0.1.0.0 - - boring ==0.1.3 + - boring ==0.2 - both ==0.1.1.1 - bound ==2.0.3 - BoundedChan ==1.0.3.0 @@ -535,7 +535,7 @@ default-package-overrides: - composite-hashable ==0.7.4.0 - composite-tuple ==0.1.2.0 - composite-xstep ==0.1.0.0 - - composition ==1.0.2.1 + - composition ==1.0.2.2 - composition-extra ==2.0.0 - concise ==0.1.0.1 - concurrency ==1.11.0.1 @@ -661,7 +661,7 @@ default-package-overrides: - data-ordlist ==0.4.7.0 - data-ref ==0.0.2 - data-reify ==0.6.3 - - data-serializer ==0.3.4.1 + - data-serializer ==0.3.5 - data-textual ==0.3.0.3 - dataurl ==0.1.0.0 - DAV ==1.3.4 @@ -708,7 +708,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.7.6 + - dl-fedora ==0.7.7 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -873,7 +873,7 @@ default-package-overrides: - fix-whitespace ==0.0.5 - flac ==0.2.0 - flac-picture ==0.1.2 - - flags-applicative ==0.1.0.2 + - flags-applicative ==0.1.0.3 - flat ==0.4.4 - flat-mcmc ==1.5.2 - flexible-defaults ==0.0.3 @@ -1043,7 +1043,7 @@ default-package-overrides: - graphite ==0.10.0.1 - graphql-client ==1.1.1 - graphs ==0.7.1 - - graphula ==2.0.0.3 + - graphula ==2.0.0.4 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 @@ -1126,7 +1126,7 @@ default-package-overrides: - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hgrev ==0.2.6 - - hidapi ==0.1.6 + - hidapi ==0.1.7 - hie-bios ==0.7.5 - hi-file-parser ==0.1.1.0 - higher-leveldb ==0.6.0.0 @@ -1162,7 +1162,7 @@ default-package-overrides: - hp2pretty ==0.10 - hpack ==0.34.4 - hpack-dhall ==0.5.2 - - hpc-codecov ==0.2.0.2 + - hpc-codecov ==0.3.0.0 - hpc-lcov ==1.0.1 - hprotoc ==2.4.17 - hruby ==0.3.8.1 @@ -1185,7 +1185,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.6 + - HsOpenSSL ==0.11.6.1 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.9 @@ -1465,7 +1465,7 @@ default-package-overrides: - liboath-hs ==0.0.1.2 - libyaml ==0.1.2 - LibZip ==1.0.1 - - lifted-async ==0.10.1.3 + - lifted-async ==0.10.2 - lifted-base ==0.2.3.12 - lift-generics ==0.2 - line ==4.0.1 @@ -1629,7 +1629,7 @@ default-package-overrides: - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 - mono-traversable-keys ==0.1.0 - - more-containers ==0.2.2.0 + - more-containers ==0.2.2.2 - morpheus-graphql ==0.17.0 - morpheus-graphql-app ==0.17.0 - morpheus-graphql-client ==0.17.0 @@ -2069,7 +2069,7 @@ default-package-overrides: - rhine-gloss ==0.7.0 - rigel-viz ==0.2.0.0 - rio ==0.1.20.0 - - rio-orphans ==0.1.1.0 + - rio-orphans ==0.1.2.0 - rio-prettyprint ==0.1.1.0 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 @@ -2163,7 +2163,7 @@ default-package-overrides: - servant-swagger ==1.1.10 - servant-swagger-ui ==0.3.4.3.37.2 - servant-swagger-ui-core ==0.3.4 - - serverless-haskell ==0.12.5 + - serverless-haskell ==0.12.6 - serversession ==1.0.2 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -2234,7 +2234,7 @@ default-package-overrides: - soap-tls ==0.1.1.4 - socket ==0.8.3.0 - socks ==0.6.1 - - some ==1.0.2 + - some ==1.0.3 - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 @@ -2309,7 +2309,7 @@ default-package-overrides: - string-conversions ==0.4.0.1 - string-interpolate ==0.3.1.0 - string-qq ==0.0.4 - - string-random ==0.1.4.0 + - string-random ==0.1.4.1 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - stripe-concepts ==1.0.2.6 @@ -2362,7 +2362,7 @@ default-package-overrides: - tardis ==0.4.3.0 - tasty ==1.4.1 - tasty-ant-xml ==1.1.8 - - tasty-bench ==0.2.4 + - tasty-bench ==0.2.5 - tasty-dejafu ==2.0.0.7 - tasty-discover ==4.2.2 - tasty-expected-failure ==0.12.3 @@ -2741,7 +2741,7 @@ default-package-overrides: - yesod-sitemap ==1.6.0 - yesod-static ==1.6.1.0 - yesod-test ==1.6.12 - - yesod-websockets ==0.3.0.2 + - yesod-websockets ==0.3.0.3 - yes-precure5-command ==5.5.3 - yi-rope ==0.11 - yjsvg ==0.2.0.1 From 546af13867871c4f9fa1929b08a262775782c6fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 9 Apr 2021 20:51:58 +0200 Subject: [PATCH 03/57] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-2-g2ef7e72 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/1aad60ed9679a7597f3fc3515a0fe26fdb896e55. --- .../haskell-modules/hackage-packages.nix | 337 +----------------- 1 file changed, 19 insertions(+), 318 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3fa0fecb730a..71933e3e20b3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10836,8 +10836,8 @@ self: { ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.6"; - sha256 = "1gkx6kk03ziz9wk6iwxcdpf1ig8a9whwv3yjbzmqrwkp7fh1wdrw"; + version = "0.11.6.1"; + sha256 = "0jmnmrhvm7rbspv0vw482i8wpmkzhnnwxswqwx75455w0mvdg62l"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -39959,20 +39959,6 @@ self: { }) {}; "benchpress" = callPackage - ({ mkDerivation, base, bytestring, mtl, time }: - mkDerivation { - pname = "benchpress"; - version = "0.2.2.15"; - sha256 = "0bffchlwcyqgbnviqvm01lyj7zldvd3yj9yqnc8150lgxr29kvf9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl time ]; - executableHaskellDepends = [ base bytestring time ]; - description = "Micro-benchmarking with detailed statistics"; - license = lib.licenses.bsd3; - }) {}; - - "benchpress_0_2_2_16" = callPackage ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; @@ -39984,7 +39970,6 @@ self: { executableHaskellDepends = [ base bytestring time ]; description = "Micro-benchmarking with detailed statistics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "bencode" = callPackage @@ -45428,26 +45413,6 @@ self: { }) {}; "boring" = callPackage - ({ mkDerivation, adjunctions, base, base-compat, bin, constraints - , dec, fin, generics-sop, ral, singleton-bool, streams, tagged - , transformers, transformers-compat, vec - }: - mkDerivation { - pname = "boring"; - version = "0.1.3"; - sha256 = "1fljlkzc5016xbq9jykh0wr1mbyfcikh818pp54djws5vm66hh6d"; - revision = "2"; - editedCabalFile = "031vricyy2m7hg2hk3bj64lsz55k9qh36s2yfh09pgsfykr883ag"; - libraryHaskellDepends = [ - adjunctions base base-compat bin constraints dec fin generics-sop - ral singleton-bool streams tagged transformers transformers-compat - vec - ]; - description = "Boring and Absurd types"; - license = lib.licenses.bsd3; - }) {}; - - "boring_0_2" = callPackage ({ mkDerivation, base, tagged, transformers }: mkDerivation { pname = "boring"; @@ -45456,7 +45421,6 @@ self: { libraryHaskellDepends = [ base tagged transformers ]; description = "Boring and Absurd types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "boring-game" = callPackage @@ -60613,16 +60577,6 @@ self: { }) {}; "composition" = callPackage - ({ mkDerivation }: - mkDerivation { - pname = "composition"; - version = "1.0.2.1"; - sha256 = "0smdyzcnfwiab1wnazmk4szali1ckh7dqcdp9vn7qnnabq7k08vi"; - description = "Combinators for unorthodox function composition"; - license = lib.licenses.bsd3; - }) {}; - - "composition_1_0_2_2" = callPackage ({ mkDerivation }: mkDerivation { pname = "composition"; @@ -60630,7 +60584,6 @@ self: { sha256 = "0bnl8kmaqbjnznqgnjj2gr2qygln6y6493prk0anpd8zdylzf2xm"; description = "Combinators for unorthodox function composition"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "composition-extra" = callPackage @@ -65270,7 +65223,7 @@ self: { license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python3;}; + }) {python3 = null;}; "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, Decimal @@ -70625,24 +70578,6 @@ self: { }) {}; "data-serializer" = callPackage - ({ mkDerivation, base, binary, bytestring, cereal, data-endian - , parsers, semigroups, split, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "data-serializer"; - version = "0.3.4.1"; - sha256 = "1md6zkv1yqxmyca6mljw8y5g3xaqz3g087qd49qpi94w0x1lqgnk"; - libraryHaskellDepends = [ - base binary bytestring cereal data-endian parsers semigroups split - ]; - testHaskellDepends = [ - base binary bytestring cereal tasty tasty-quickcheck - ]; - description = "Common API for serialization libraries"; - license = lib.licenses.bsd3; - }) {}; - - "data-serializer_0_3_5" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, data-endian , parsers, split, tasty, tasty-quickcheck }: @@ -70658,7 +70593,6 @@ self: { ]; description = "Common API for serialization libraries"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "data-size" = callPackage @@ -78044,8 +77978,8 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.6"; - sha256 = "03npp2cq1259w590am87v0r4q48pfjq2zb2b04hymlr6hi3a8xw5"; + version = "0.7.7"; + sha256 = "0m4rf0h2hzsd00cgn14w1n8pyrqrikwnf9d232lzwx6qx3nf2nqp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -78053,6 +77987,7 @@ self: { optparse-applicative regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs ]; + testHaskellDepends = [ base simple-cmd ]; description = "Fedora image download tool"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; @@ -93037,22 +92972,6 @@ self: { }) {}; "flags-applicative" = callPackage - ({ mkDerivation, base, casing, containers, hspec, mtl, network - , text - }: - mkDerivation { - pname = "flags-applicative"; - version = "0.1.0.2"; - sha256 = "192yghdmylynn57l22ahb6dhrbl590dxmv2cdn755r22v7dbhsgf"; - libraryHaskellDepends = [ - base casing containers mtl network text - ]; - testHaskellDepends = [ base containers hspec text ]; - description = "Applicative flag parsing"; - license = lib.licenses.bsd3; - }) {}; - - "flags-applicative_0_1_0_3" = callPackage ({ mkDerivation, base, casing, containers, hspec, mtl, network , text }: @@ -93066,7 +92985,6 @@ self: { testHaskellDepends = [ base containers hspec text ]; description = "Applicative flag parsing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "flamethrower" = callPackage @@ -111967,35 +111885,6 @@ self: { }) {}; "graphula" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , generics-eot, hspec, http-api-data, HUnit, markdown-unlit - , monad-logger, mtl, path-pieces, persistent, persistent-sqlite - , persistent-template, QuickCheck, random, resourcet, semigroups - , temporary, text, transformers, unliftio, unliftio-core, uuid - }: - mkDerivation { - pname = "graphula"; - version = "2.0.0.3"; - sha256 = "1hmay1g8j1b8pq98blq1sizc61h7lj782sajlwrllgvxc826rjm2"; - libraryHaskellDepends = [ - base containers directory generics-eot HUnit mtl persistent - QuickCheck random semigroups temporary text transformers unliftio - unliftio-core - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec http-api-data markdown-unlit - monad-logger path-pieces persistent persistent-sqlite - persistent-template QuickCheck resourcet text transformers - unliftio-core uuid - ]; - testToolDepends = [ markdown-unlit ]; - description = "A declarative library for describing dependencies between data"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "graphula_2_0_0_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , generics-eot, hspec, http-api-data, HUnit, markdown-unlit , monad-logger, mtl, path-pieces, persistent, persistent-sqlite @@ -122606,8 +122495,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.4"; - sha256 = "0qgiskx01rlwdmidv01k4mr9awb4sj6srhcrrsmiqd7fdnlaxb3s"; + version = "0.52.5"; + sha256 = "1vxm0y850bk3xhjy53rqx8231xvvdiw546izpz2x4ydnqg507w2b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122648,22 +122537,23 @@ self: { ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal , containers, data-default, deepseq, hashable, haskoin-core, hspec , hspec-discover, http-client, http-types, lens, mtl, network - , QuickCheck, scotty, string-conversions, text + , QuickCheck, scotty, string-conversions, text, time , unordered-containers, wreq }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.0"; - sha256 = "0fgjmyps858dvx8i2mzn8kqmms869wamldrdlmy2y27wcmrzzj51"; + version = "0.52.5"; + sha256 = "1yhjdvfbri1n900wkrql7j9h5d2igqap9yjpssvkb2wrxb22zmc1"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl - network scotty string-conversions text unordered-containers wreq + network scotty string-conversions text time unordered-containers + wreq ]; testHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core hspec http-client http-types lens mtl - network QuickCheck scotty string-conversions text + network QuickCheck scotty string-conversions text time unordered-containers wreq ]; testToolDepends = [ hspec-discover ]; @@ -129071,22 +128961,6 @@ self: { }) {}; "hidapi" = callPackage - ({ mkDerivation, base, bytestring, deepseq, deepseq-generics - , systemd - }: - mkDerivation { - pname = "hidapi"; - version = "0.1.6"; - sha256 = "1dy5sbfh8rkzrjpn5ls5xbr32ja0h6bgigzya512advc4c21af2b"; - libraryHaskellDepends = [ - base bytestring deepseq deepseq-generics - ]; - librarySystemDepends = [ systemd ]; - description = "Haskell bindings to HIDAPI"; - license = lib.licenses.mit; - }) {inherit (pkgs) systemd;}; - - "hidapi_0_1_7" = callPackage ({ mkDerivation, base, bytestring, deepseq, deepseq-generics , systemd }: @@ -129100,7 +128974,6 @@ self: { librarySystemDepends = [ systemd ]; description = "Haskell bindings to HIDAPI"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) systemd;}; "hidden-char" = callPackage @@ -134816,27 +134689,6 @@ self: { }) {}; "hpc-codecov" = callPackage - ({ mkDerivation, array, base, bytestring, directory, filepath, hpc - , tar, tasty, tasty-hunit - }: - mkDerivation { - pname = "hpc-codecov"; - version = "0.2.0.2"; - sha256 = "0x95ikxrymvgakpiycbl027nv23c8c7p369zvbbr2bv67jvb7fzv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring directory filepath hpc - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory filepath tar tasty tasty-hunit - ]; - description = "Generate codecov report from hpc data"; - license = lib.licenses.bsd3; - }) {}; - - "hpc-codecov_0_3_0_0" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath, hpc , process, tasty, tasty-hunit }: @@ -134855,7 +134707,6 @@ self: { ]; description = "Generate codecov report from hpc data"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hpc-coveralls" = callPackage @@ -154294,7 +154145,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "json-qq" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell @@ -164233,27 +164084,6 @@ self: { }) {}; "lifted-async" = callPackage - ({ mkDerivation, async, base, constraints, deepseq, HUnit - , lifted-base, monad-control, mtl, tasty, tasty-bench - , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base - }: - mkDerivation { - pname = "lifted-async"; - version = "0.10.1.3"; - sha256 = "1hml672j8sqxhklxif3nwr8v59a596wwwbllq0zvvmlxcjdzlh7k"; - libraryHaskellDepends = [ - async base constraints lifted-base monad-control transformers-base - ]; - testHaskellDepends = [ - async base HUnit lifted-base monad-control mtl tasty - tasty-expected-failure tasty-hunit tasty-th - ]; - benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; - description = "Run lifted IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "lifted-async_0_10_2" = callPackage ({ mkDerivation, async, base, constraints, deepseq, HUnit , lifted-base, monad-control, mtl, tasty, tasty-bench , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base @@ -164272,7 +164102,6 @@ self: { benchmarkHaskellDepends = [ async base deepseq tasty-bench ]; description = "Run lifted IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lifted-base" = callPackage @@ -169898,7 +169727,7 @@ self: { ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; - }) {inherit (pkgs) lzma;}; + }) {lzma = null;}; "lzma-clib" = callPackage ({ mkDerivation }: @@ -169953,7 +169782,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) lzma;}; + }) {lzma = null;}; "lzma-static" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty @@ -180233,18 +180062,6 @@ self: { }) {}; "more-containers" = callPackage - ({ mkDerivation, base, binary, containers, hspec }: - mkDerivation { - pname = "more-containers"; - version = "0.2.2.0"; - sha256 = "1i4klvfwgw608sy81mqqvd107b187gkib2rwsz6aqc4rh0vm0a87"; - libraryHaskellDepends = [ base binary containers ]; - testHaskellDepends = [ base binary containers hspec ]; - description = "A few more collections"; - license = lib.licenses.mit; - }) {}; - - "more-containers_0_2_2_2" = callPackage ({ mkDerivation, base, binary, containers, hspec }: mkDerivation { pname = "more-containers"; @@ -180254,7 +180071,6 @@ self: { testHaskellDepends = [ base binary containers hspec ]; description = "A few more collections"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "more-extensible-effects" = callPackage @@ -214266,7 +214082,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "pyfi" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, pureMD5 @@ -214284,7 +214100,7 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) python;}; + }) {python = null;}; "python-pickle" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs @@ -225342,26 +225158,6 @@ self: { }) {}; "rio-orphans" = callPackage - ({ mkDerivation, base, exceptions, fast-logger, hspec - , monad-control, monad-logger, resourcet, rio, transformers-base - }: - mkDerivation { - pname = "rio-orphans"; - version = "0.1.1.0"; - sha256 = "0klbshdsv3gq3l7g1d6gq2wxdqjlqxbnwk1lbg5dpbz7yrnjr3by"; - libraryHaskellDepends = [ - base exceptions fast-logger monad-control monad-logger resourcet - rio transformers-base - ]; - testHaskellDepends = [ - base exceptions fast-logger hspec monad-control monad-logger - resourcet rio transformers-base - ]; - description = "Orphan instances for the RIO type in the rio package"; - license = lib.licenses.mit; - }) {}; - - "rio-orphans_0_1_2_0" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base , unliftio-core @@ -225380,7 +225176,6 @@ self: { ]; description = "Orphan instances for the RIO type in the rio package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "rio-prettyprint" = callPackage @@ -235705,33 +235500,6 @@ self: { }) {}; "serverless-haskell" = callPackage - ({ mkDerivation, aeson, aeson-casing, amazonka-core - , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive - , hspec, hspec-discover, http-client, http-types, iproute, lens - , raw-strings-qq, safe-exceptions, text, time, transformers, unix - , unordered-containers - }: - mkDerivation { - pname = "serverless-haskell"; - version = "0.12.5"; - sha256 = "1p15nzwjbwbjxnqgs6dzz7sb2cp5y3l69hr3n10zmwmgrq4x2nfa"; - libraryHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive http-client http-types iproute lens - safe-exceptions text time unix unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive hspec hspec-discover http-client - http-types iproute lens raw-strings-qq safe-exceptions text time - transformers unix unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = lib.licenses.mit; - }) {}; - - "serverless-haskell_0_12_6" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , containers, hspec, hspec-discover, http-client, http-types @@ -235756,7 +235524,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "serversession" = callPackage @@ -244193,18 +243960,6 @@ self: { }) {}; "some" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "some"; - version = "1.0.2"; - sha256 = "12mv5gzcvl4n5rz685r2nmmiykvnkvrvx7k4cvwscdjjgnqa9y6c"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base ]; - description = "Existential type: Some"; - license = lib.licenses.bsd3; - }) {}; - - "some_1_0_3" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; @@ -244214,7 +243969,6 @@ self: { testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -250963,29 +250717,6 @@ self: { }) {}; "string-random" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , optparse-applicative, pcre-heavy, QuickCheck, random, tasty - , tasty-hunit, tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "string-random"; - version = "0.1.4.0"; - sha256 = "09xv1jbhsz8hfxc6y54fj4pkhyxfbfh53i6kxy408zm3raa2nmii"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base containers random text transformers - ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ - base bytestring pcre-heavy QuickCheck tasty tasty-hunit - tasty-quickcheck text - ]; - description = "A library for generating random string from a regular experession"; - license = lib.licenses.bsd3; - }) {}; - - "string-random_0_1_4_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , optparse-applicative, pcre-heavy, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, text, transformers @@ -251006,7 +250737,6 @@ self: { ]; description = "A library for generating random string from a regular experession"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "string-similarity" = callPackage @@ -256486,17 +256216,6 @@ self: { }) {}; "tasty-bench" = callPackage - ({ mkDerivation, base, containers, deepseq, tasty }: - mkDerivation { - pname = "tasty-bench"; - version = "0.2.4"; - sha256 = "11hkhlpwxzxxi6ny4jklaz70cd0ca905yxv9idacmwajbrliinna"; - libraryHaskellDepends = [ base containers deepseq tasty ]; - description = "Featherlight benchmark framework"; - license = lib.licenses.mit; - }) {}; - - "tasty-bench_0_2_5" = callPackage ({ mkDerivation, base, containers, deepseq, tasty }: mkDerivation { pname = "tasty-bench"; @@ -256505,7 +256224,6 @@ self: { libraryHaskellDepends = [ base containers deepseq tasty ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-dejafu" = callPackage @@ -289919,22 +289637,6 @@ self: { }) {}; "yesod-websockets" = callPackage - ({ mkDerivation, base, conduit, mtl, transformers, unliftio - , wai-websockets, websockets, yesod-core - }: - mkDerivation { - pname = "yesod-websockets"; - version = "0.3.0.2"; - sha256 = "1k206l84g25xml8yg4q7i62x5aydxq2hni2fk2cc36dlvl0rgih1"; - libraryHaskellDepends = [ - base conduit mtl transformers unliftio wai-websockets websockets - yesod-core - ]; - description = "WebSockets support for Yesod"; - license = lib.licenses.mit; - }) {}; - - "yesod-websockets_0_3_0_3" = callPackage ({ mkDerivation, base, conduit, mtl, transformers, unliftio , wai-websockets, websockets, yesod-core }: @@ -289948,7 +289650,6 @@ self: { ]; description = "WebSockets support for Yesod"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-websockets-extra" = callPackage From c8ac41fafcbb938efbd1dd819eb318f15187530b Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 10 Apr 2021 00:09:12 +0900 Subject: [PATCH 04/57] haskellPackages: add changelog argument to Haskell generic-builder.nix changelog was recently added as a new meta field in https://github.com/NixOS/nixpkgs/pull/60371. This commit adds similar support to the Haskell generic builder. --- 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 582cf6df010c..faf80da0c7d9 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -51,6 +51,7 @@ in , license , enableParallelBuilding ? true , maintainers ? null +, changelog ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -642,6 +643,7 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } + // optionalAttrs (args ? changelog) { inherit changelog; } ; } From 250ae4062c3ec7a9cccc86f8dda5ecb89970bfe1 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 10 Apr 2021 00:13:23 +0900 Subject: [PATCH 05/57] spago: make use of new changelog field for haskell generic builder --- pkgs/development/tools/purescript/spago/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/purescript/spago/default.nix b/pkgs/development/tools/purescript/spago/default.nix index 6fef3dd86757..980bca0fa2db 100644 --- a/pkgs/development/tools/purescript/spago/default.nix +++ b/pkgs/development/tools/purescript/spago/default.nix @@ -17,6 +17,8 @@ let maintainers = (oldAttrs.maintainers or []) ++ [ lib.maintainers.cdepillabout ]; + changelog = + "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}"; })); in From a84b250f7f23f4d9adc89c6a0d1d5bc90d7b2c12 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 11 Apr 2021 02:30:31 +0200 Subject: [PATCH 06/57] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-2-g2ef7e72 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3601914c12f130f2ed460b8531502da57e7ef6b1. --- .../haskell-modules/hackage-packages.nix | 171 +++++++++++++----- 1 file changed, 126 insertions(+), 45 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 71933e3e20b3..0b7d3cab5a9f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8962,8 +8962,8 @@ self: { }: mkDerivation { pname = "HPDF"; - version = "1.5.2"; - sha256 = "0mp3lbyyp6iykqrnviam46wb5aab24c1ncivxp5c2v5hg89a1jrm"; + version = "1.5.3"; + sha256 = "12h3gx9gikzz4fwf11zk1nwzbpwqzzyavjz8mr27scy3s94vw41r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50485,8 +50485,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.27.0"; - sha256 = "1aslkqv8j5zq3pznlw4ga32gz8w29xd365rcjw3xbdj4cygpix40"; + version = "0.1.28.0"; + sha256 = "0szxkhg6wgz2yr1dwsnvcyia45jjcysjzb65jrswdy6y2q0hmqlf"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -53848,10 +53848,8 @@ self: { }: mkDerivation { pname = "chassis"; - version = "0.0.4.0"; - sha256 = "1mvi7h6pp1j3x4yccqy962f8d3gbm4sj5fvnfwxygnxqqhmy1dvk"; - revision = "1"; - editedCabalFile = "15pncz2x3llb2sg2x4as4r0wbx528dvlp0gvc2rl9y9dxhv89d9h"; + version = "0.0.5.0"; + sha256 = "0f9iipl7l9jhi6754yysk9kkliiab60ds95k8r4gjcch3hh4zbcj"; libraryHaskellDepends = [ base bytestring comonad composite-base containers contravariant distributive either exceptions extra first-class-families path @@ -56672,8 +56670,8 @@ self: { }: mkDerivation { pname = "cli-extras"; - version = "0.1.0.1"; - sha256 = "1fggrnhdbr2ialdd93d0m81b85izs1gvcs8bkmwm8wdxgw4v7hsi"; + version = "0.1.0.2"; + sha256 = "1qcvphbimcclvy7qkqrz9djg4650axwqjfyq6nlbvmpivh14m9vq"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring containers exceptions io-streams lens logging-effect monad-logger monad-loops mtl process @@ -56691,8 +56689,8 @@ self: { }: mkDerivation { pname = "cli-git"; - version = "0.1.0.1"; - sha256 = "0jchv1j7dgay6xzny9rinsybavs4ggk93450cka6sp7015z06ysr"; + version = "0.1.0.2"; + sha256 = "08gjhg2bc8i9i1clpxp5bzk4sp4izfbhjqmbmfmqqzv6ci0p5fxx"; libraryHaskellDepends = [ base cli-extras containers data-default exceptions lens logging-effect megaparsec mtl text @@ -96965,17 +96963,21 @@ self: { }) {}; "ftdi" = callPackage - ({ mkDerivation, base, base-unicode-symbols, bytestring, safe - , transformers, usb + ({ mkDerivation, async, base, base-unicode-symbols, bytestring + , generic-random, QuickCheck, random, tagged, test-framework + , test-framework-quickcheck2, transformers, usb, vector }: mkDerivation { pname = "ftdi"; - version = "0.2.0.1"; - sha256 = "1gnfbngn3jwva6nvrcrzmi2n2vy4k55yh41zvg0kyb61w7kgm4m8"; - isLibrary = true; - isExecutable = true; + version = "0.3.0.0"; + sha256 = "1yhcpd9jzhmvlmhidyv70s5mvakq6jn9lb3zh132lrqsrirbmpx8"; libraryHaskellDepends = [ - base base-unicode-symbols bytestring safe transformers usb + async base base-unicode-symbols bytestring transformers usb vector + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring generic-random QuickCheck + random tagged test-framework test-framework-quickcheck2 + transformers usb vector ]; description = "A thin layer over USB to communicate with FTDI chips"; license = lib.licenses.bsd3; @@ -106642,6 +106644,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "gl3w" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gl3w"; + version = "0.1.0"; + sha256 = "14wm8wp4jxi4fq75bvr6sl4xmsxjfw30yq7011v28xqpm9015ns0"; + libraryHaskellDepends = [ base ]; + description = "Haskell bindings for the gl3w library"; + license = lib.licenses.mit; + }) {}; + "glabrous" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text @@ -119511,32 +119524,33 @@ self: { }) {}; "haskell-awk" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, doctest - , easy-file, exceptions, filepath, haskell-src-exts, hint, hspec - , HUnit, mtl, network, process, stringsearch, temporary - , test-framework, test-framework-hunit, time, transformers + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, directory, doctest, easy-file + , exceptions, extra, filelock, filepath, ghc, haskell-src-exts + , hint, hspec, HUnit, list-t, mtl, process, stringsearch + , template-haskell, temporary, test-framework, test-framework-hunit + , time, transformers }: mkDerivation { pname = "haskell-awk"; - version = "1.1.1"; - sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd"; - revision = "2"; - editedCabalFile = "1nq69vqp5dphhkq3h94c1gw2hpgyn2snnsig6kjwm4z60ww87viw"; + version = "1.2"; + sha256 = "14jfw5s3xw7amwasw37mxfinzwvxd6pr64iypmy65z7bkx3l01cj"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base bytestring containers stringsearch + base bytestring containers ghc list-t stringsearch ]; executableHaskellDepends = [ - base bytestring containers directory easy-file exceptions filepath - haskell-src-exts hint mtl network process stringsearch time - transformers + base bytestring containers directory exceptions extra filelock + filepath ghc haskell-src-exts hint list-t mtl process stringsearch + template-haskell time transformers ]; testHaskellDepends = [ - base bytestring containers directory doctest easy-file exceptions - filepath haskell-src-exts hint hspec HUnit mtl network process - stringsearch temporary test-framework test-framework-hunit time - transformers + aeson attoparsec base bytestring containers directory doctest + easy-file exceptions extra filelock filepath ghc haskell-src-exts + hint hspec HUnit list-t mtl process stringsearch template-haskell + temporary test-framework test-framework-hunit time transformers ]; description = "Transform text from the command-line using Haskell expressions"; license = lib.licenses.asl20; @@ -122495,8 +122509,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.5"; - sha256 = "1vxm0y850bk3xhjy53rqx8231xvvdiw546izpz2x4ydnqg507w2b"; + version = "0.52.6"; + sha256 = "19j4cvxnrqhckbyjnwg2z4ixavbkgcxlxspsxakawaffqhq49wq8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122542,8 +122556,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.5"; - sha256 = "1yhjdvfbri1n900wkrql7j9h5d2igqap9yjpssvkb2wrxb22zmc1"; + version = "0.52.6"; + sha256 = "0npiib582rnbk3w9f0m71y84xpk7akzkypfxrd9n1s4h3dh0qsfw"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -169790,8 +169804,8 @@ self: { }: mkDerivation { pname = "lzma-static"; - version = "5.2.5"; - sha256 = "13xgap430r2hpkwk56ra5ya8fparikpzy50mbyd0xdpvs02imwfp"; + version = "5.2.5.1"; + sha256 = "1hky1aa1bl6zxnhwgpghx1wf43g74x6f4xpi21l65a39sb25bqf0"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -188341,8 +188355,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.2.0.2"; - sha256 = "1jxdxb8ri0cd7ni9z80xlb86d81bb83c6ki5wj7jx7sn9inzz8z7"; + version = "0.2.0.3"; + sha256 = "1pcmn31hf81gxmmjyqc23pwpaafx03alvx2fgynd1isdsb0057my"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -214370,6 +214384,24 @@ self: { license = lib.licenses.mit; }) {}; + "qr" = callPackage + ({ mkDerivation, array, base, cairo, gtk, optparse-applicative + , transformers, utf8-string + }: + mkDerivation { + pname = "qr"; + version = "0.2.0.0"; + sha256 = "0mn33p9j87w5fq4ddrwn5nb32gcxzxli55y3jv1aaypsgi6vf3w7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base utf8-string ]; + executableHaskellDepends = [ + array base cairo gtk optparse-applicative transformers + ]; + description = "Pure Haskell QR encoder library and command line tool"; + license = lib.licenses.bsd3; + }) {}; + "qr-imager" = callPackage ({ mkDerivation, base, binary, bytestring, cryptonite, directory , haskell-qrencode, hspec, jose-jwt, JuicyPixels, microlens @@ -224189,8 +224221,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "0.1.1.1"; - sha256 = "1l6pcvmf95i4r4b370j8dwqbvj3971xn6097lbw93agyrf704qpi"; + version = "1.0.0.0"; + sha256 = "1hrkx7gx7hwgljvx8zm1yhn7xvyif943hvxx5b27ali6grmndy9w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -261245,6 +261277,8 @@ self: { pname = "th-utilities"; version = "0.2.4.2"; sha256 = "09rbs878gjhyg8n789p2c67lzxr4h1pg0zar47a7j8sg6ff5wcx2"; + revision = "1"; + editedCabalFile = "177hbrwcyalm6gbqq96b5xz974bxzch9g2mvffvksi1205z6v7dr"; libraryHaskellDepends = [ base bytestring containers directory filepath primitive syb template-haskell text th-abstraction th-orphans @@ -261257,6 +261291,28 @@ self: { license = lib.licenses.mit; }) {}; + "th-utilities_0_2_4_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, primitive, syb, template-haskell, text, th-abstraction + , th-orphans, vector + }: + mkDerivation { + pname = "th-utilities"; + version = "0.2.4.3"; + sha256 = "1krvn3xp7zicp6wqcgmgbgl2a894n677vxi6vhcna16cx03smic9"; + libraryHaskellDepends = [ + base bytestring containers directory filepath primitive syb + template-haskell text th-abstraction th-orphans + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec primitive syb + template-haskell text th-abstraction th-orphans vector + ]; + description = "Collection of useful functions for use with Template Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "thank-you-stars" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, filepath, hackage-db, hspec, req, split, text @@ -279106,6 +279162,31 @@ self: { broken = true; }) {}; + "wai-session-redis" = callPackage + ({ mkDerivation, base, bytestring, cereal, data-default, hedis + , hspec, http-types, vault, wai, wai-session, warp + }: + mkDerivation { + pname = "wai-session-redis"; + version = "0.1.0.0"; + sha256 = "12l2r85xq8ryv6y660c20yfxa19n3rvkilmkb74bj1ch7jmm8d6n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal data-default hedis vault wai wai-session + ]; + executableHaskellDepends = [ + base bytestring cereal data-default hedis http-types vault wai + wai-session warp + ]; + testHaskellDepends = [ + base bytestring cereal data-default hedis hspec vault wai + wai-session + ]; + description = "Simple Redis backed wai-session backend"; + license = lib.licenses.bsd3; + }) {}; + "wai-session-tokyocabinet" = callPackage ({ mkDerivation, base, bytestring, cereal, errors , tokyocabinet-haskell, transformers, wai-session From 797b39342845d0406cebdf9233497d4705c8c89d Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Sun, 11 Apr 2021 13:51:02 +0200 Subject: [PATCH 07/57] haskellPackages.PyF: un mark as broken `PyF` is not broken, neither `krank` which depends on it. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e3e3d65da01a..cc6df86a7a9f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7490,7 +7490,6 @@ broken-packages: - kparams - kqueue - kraken - - krank - krapsh - Kriens - krpc @@ -9330,7 +9329,6 @@ broken-packages: - puzzle-draw - puzzle-draw-cmdline - pvd - - PyF - pyffi - pyfi - python-pickle From b6f09d8b83c5ef4d6ba62a631eb66d065254c1b2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 15 Apr 2021 02:30:39 +0200 Subject: [PATCH 08/57] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/46b74aa1f540799cf40a1b5481afab2bdac3084d. --- .../haskell-modules/hackage-packages.nix | 1070 ++++++++++++++--- 1 file changed, 933 insertions(+), 137 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0b7d3cab5a9f..ced1d5e40a5e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6908,6 +6908,27 @@ self: { broken = true; }) {}; + "GPipe-Core" = callPackage + ({ mkDerivation, base, Boolean, containers, criterion + , exception-transformers, gl, hspec, hspec-discover, lens, linear + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "GPipe-Core"; + version = "0.2.3.1"; + sha256 = "0yrqhm77bn8dwx335fpkjyxz5jm7i7g5hpxgk9xrrm6b3sm24w0j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base Boolean containers exception-transformers gl lens linear text + transformers unordered-containers + ]; + testHaskellDepends = [ base hspec lens ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion lens ]; + description = "Typesafe functional GPU graphics programming"; + license = lib.licenses.mit; + }) {}; + "GPipe-Examples" = callPackage ({ mkDerivation, base, GLUT, GPipe, GPipe-TextureLoad, haskell98 , Vec, Vec-Transform @@ -6941,6 +6962,35 @@ self: { broken = true; }) {}; + "GPipe-GLFW4" = callPackage + ({ mkDerivation, async, base, containers, criterion + , exception-transformers, GLFW-b, GPipe-Core, hspec, hspec-discover + , JuicyPixels, lens, stm, transformers + }: + mkDerivation { + pname = "GPipe-GLFW4"; + version = "2.0.0"; + sha256 = "1bzbnn7ip5n01kd7nydlmmp5xbzhnfpfhhcmlx1l9qjwzj4zf708"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base containers GLFW-b GPipe-Core stm + ]; + executableHaskellDepends = [ + base exception-transformers GPipe-Core lens transformers + ]; + testHaskellDepends = [ + base exception-transformers GPipe-Core hspec lens transformers + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion GPipe-Core JuicyPixels + ]; + description = "GLFW OpenGL context creation for GPipe"; + license = lib.licenses.mit; + }) {}; + "GPipe-TextureLoad" = callPackage ({ mkDerivation, base, bitmap, GPipe, stb-image }: mkDerivation { @@ -11254,6 +11304,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "IPv6Addr_2_0_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network + , network-info, random, test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "IPv6Addr"; + version = "2.0.2"; + sha256 = "0r712250lv8brgy3ysdyj41snl0qbsx9h0p853w8n1aif0fsnxkw"; + libraryHaskellDepends = [ + aeson attoparsec base iproute network network-info random text + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit text + ]; + description = "Library to deal with IPv6 address text representations"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "IPv6DB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger , hedis, hspec, http-client, http-types, IPv6Addr, mtl @@ -16461,8 +16530,6 @@ self: { ]; description = "Quasiquotations for a python like interpolated string formater"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "QIO" = callPackage @@ -19166,6 +19233,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "Spintax_0_3_6" = callPackage + ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: + mkDerivation { + pname = "Spintax"; + version = "0.3.6"; + sha256 = "000yprzvq72ia6wfk3hjarb8anx3wfm54rzpv8x7d2zf09pzxk6k"; + libraryHaskellDepends = [ + attoparsec base extra mtl mwc-random text + ]; + description = "Random text generation based on spintax"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -22157,8 +22238,8 @@ self: { }: mkDerivation { pname = "Z-MessagePack"; - version = "0.3.0.1"; - sha256 = "1xn3by0fkn8w9akldfk2rrfk8ns2r64zxqadrcsgga7nv88q49am"; + version = "0.4.0.1"; + sha256 = "1i1ycf1bhahbh7d9rvz4hl5jq16mld8sya2h2xrxlvg9yqab19hy"; libraryHaskellDepends = [ base containers deepseq hashable integer-gmp primitive QuickCheck scientific tagged time unordered-containers Z-Data Z-IO @@ -34751,12 +34832,12 @@ self: { , configurator, containers, cryptohash, hostname, http-client , http-client-tls, http-media, http-types, jwt, mtl, network , network-api-support, network-uri, snap, snap-core, split, text - , time, time-units, transformers, zlib + , time, time-units, transformers }: mkDerivation { pname = "atlassian-connect-core"; - version = "0.8.1.0"; - sha256 = "17xvqf2j77y8lqvl2k5a924yvjym4aqii6glwfs3rjvw6a08k9zp"; + version = "0.8.2.0"; + sha256 = "06wrbz8r4yc6spjrawqrdsc1nf3bc5nr40ssnrmyv00xzkhvjq2j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson atlassian-connect-descriptor base base64-bytestring @@ -34765,12 +34846,11 @@ self: { http-types jwt mtl network network-api-support network-uri snap snap-core split text time time-units transformers ]; - libraryPkgconfigDepends = [ zlib ]; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) zlib;}; + }) {}; "atlassian-connect-descriptor" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cases, HUnit @@ -50485,8 +50565,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.0"; - sha256 = "0szxkhg6wgz2yr1dwsnvcyia45jjcysjzb65jrswdy6y2q0hmqlf"; + version = "0.1.28.1"; + sha256 = "1zbxwz8qg7yqvl70x2bcd0nib6akd6ii6fa2mrrg1nd255q6cyjb"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -52286,6 +52366,17 @@ self: { broken = true; }) {}; + "catalyst" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "catalyst"; + version = "0.0.0.1"; + sha256 = "04vp18pblx88djjdiidhg2i52rry08kx43zzvf7nfap46zv51a6a"; + libraryHaskellDepends = [ base profunctors ]; + description = "A Category typeclass hierarchy powerful enough to encode full programs"; + license = lib.licenses.bsd3; + }) {}; + "catamorphism" = callPackage ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: mkDerivation { @@ -52528,6 +52619,27 @@ self: { broken = true; }) {}; + "cayley-client_0_4_15" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, bytestring + , exceptions, hspec, http-client, http-conduit, lens, lens-aeson + , mtl, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "cayley-client"; + version = "0.4.15"; + sha256 = "18kr88g4dlzg1ny0v3ql5yc07s0xsgbgszc69hf583d9c196lzib"; + libraryHaskellDepends = [ + aeson attoparsec base binary bytestring exceptions http-client + http-conduit lens lens-aeson mtl text transformers + unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; + description = "A Haskell client for the Cayley graph database"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "cayley-dickson" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -58389,8 +58501,8 @@ self: { pname = "codeworld-api"; version = "0.7.0"; sha256 = "1l1w4mrw4b2njz4kmfvd94mlwn776vryy1y9x9cb3r69fw5qy2f3"; - revision = "1"; - editedCabalFile = "18npi0idydgzc59a5xvlch8kpkkwn0xfi6f95i3cnzy1h1q52grr"; + revision = "3"; + editedCabalFile = "0whbjs6j4fy4jk3bc1djx1bkxpsdyms3r3rf5167x0dhxnahwcgi"; libraryHaskellDepends = [ aeson base base64-bytestring blank-canvas bytestring cereal cereal-text containers deepseq dependent-sum ghc-prim hashable @@ -60376,6 +60488,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-aeson_0_7_5_0" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, aeson-qq, base + , composite-base, containers, contravariant, generic-deriving + , hashable, hspec, lens, mmorph, mtl, profunctors, QuickCheck + , scientific, tagged, template-haskell, text, time + , unordered-containers, vector, vinyl + }: + mkDerivation { + pname = "composite-aeson"; + version = "0.7.5.0"; + sha256 = "0cxsjk3zwkhwb3bgq2ji1mvvapcwxzg333z7zfdv9ba3xgw3ngq0"; + libraryHaskellDepends = [ + aeson aeson-better-errors base composite-base containers + contravariant generic-deriving hashable lens mmorph mtl profunctors + scientific tagged template-haskell text time unordered-containers + vector vinyl + ]; + testHaskellDepends = [ + aeson aeson-better-errors aeson-qq base composite-base containers + contravariant generic-deriving hashable hspec lens mmorph mtl + profunctors QuickCheck scientific tagged template-haskell text time + unordered-containers vector vinyl + ]; + description = "JSON for Vinyl records"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-aeson-cofree-list" = callPackage ({ mkDerivation, aeson, base, composite-aeson , composite-aeson-writeonly, free, vector @@ -60402,6 +60542,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-aeson-path_0_7_5_0" = callPackage + ({ mkDerivation, base, composite-aeson, path }: + mkDerivation { + pname = "composite-aeson-path"; + version = "0.7.5.0"; + sha256 = "0b013jpdansx6fmxq1sf33975vvnajhs870a92i1lwd2k2wsj600"; + libraryHaskellDepends = [ base composite-aeson path ]; + description = "Formatting data for the path library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-aeson-refined" = callPackage ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl , refined @@ -60417,6 +60569,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-aeson-refined_0_7_5_0" = callPackage + ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl + , refined + }: + mkDerivation { + pname = "composite-aeson-refined"; + version = "0.7.5.0"; + sha256 = "05iakig5cqy4zkfl1kvjf9ck7gw5m7bdlcwwnv0kc5znyj66fbif"; + libraryHaskellDepends = [ + aeson-better-errors base composite-aeson mtl refined + ]; + description = "composite-aeson support for Refined from the refined package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-aeson-throw" = callPackage ({ mkDerivation, aeson, aeson-better-errors, base, composite-aeson , exceptions @@ -60469,6 +60637,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-base_0_7_5_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, lens + , monad-control, mtl, profunctors, QuickCheck, template-haskell + , text, transformers, transformers-base, unliftio-core, vinyl + }: + mkDerivation { + pname = "composite-base"; + version = "0.7.5.0"; + sha256 = "12qaxm20kn2cf6d19xargxfg8jrvb5ix0glm3ba0641plxlssqrq"; + libraryHaskellDepends = [ + base deepseq exceptions lens monad-control mtl profunctors + template-haskell text transformers transformers-base unliftio-core + vinyl + ]; + testHaskellDepends = [ + base deepseq exceptions hspec lens monad-control mtl profunctors + QuickCheck template-haskell text transformers transformers-base + unliftio-core vinyl + ]; + description = "Shared utilities for composite-* packages"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-binary" = callPackage ({ mkDerivation, base, binary, composite-base }: mkDerivation { @@ -60480,6 +60672,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-binary_0_7_5_0" = callPackage + ({ mkDerivation, base, binary, composite-base }: + mkDerivation { + pname = "composite-binary"; + version = "0.7.5.0"; + sha256 = "0pvmmb4m6ysgj468khmggvsgs5c0hjmcn46s0wam353abdw89i7m"; + libraryHaskellDepends = [ base binary composite-base ]; + description = "Orphan binary instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-ekg" = callPackage ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl }: @@ -60494,6 +60698,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-ekg_0_7_5_0" = callPackage + ({ mkDerivation, base, composite-base, ekg-core, lens, text, vinyl + }: + mkDerivation { + pname = "composite-ekg"; + version = "0.7.5.0"; + sha256 = "00a689laq9a2wyq33vvpw7l69wsw9g6d5jzmrsizwqld6a4wdicv"; + libraryHaskellDepends = [ + base composite-base ekg-core lens text vinyl + ]; + description = "EKG Metrics for Vinyl records"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-hashable" = callPackage ({ mkDerivation, base, composite-base, hashable }: mkDerivation { @@ -60505,6 +60724,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "composite-hashable_0_7_5_0" = callPackage + ({ mkDerivation, base, composite-base, hashable }: + mkDerivation { + pname = "composite-hashable"; + version = "0.7.5.0"; + sha256 = "1s4bnlr08fb1sszys1frkxrjrsi61jpcldh126mcwzlf6wlvqvjn"; + libraryHaskellDepends = [ base composite-base hashable ]; + description = "Orphan hashable instances"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "composite-opaleye" = callPackage ({ mkDerivation, base, bytestring, composite-base, hspec, lens , opaleye, postgresql-simple, product-profunctors, profunctors @@ -60512,8 +60743,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.4.0"; - sha256 = "0nzyslqgh7m9ryqw4rajq2m4kfknqzdq0aqnygyz0sblmgixn4hm"; + version = "0.7.5.0"; + sha256 = "1qmlhn1lj2l5qpykxdg23axvxwn8l2pvzvwqn261rj21qj90k093"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -60536,8 +60767,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.4.0"; - sha256 = "0a7pcs06m0w0mq60y3hhgn4a36gx5daypc1nh1ndsm6x3q3d99q8"; + version = "0.7.5.0"; + sha256 = "1b6bcw7gq2smghp7mnkh9gymn3mh4b1xxkv97zhxjsb91wnmvyml"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -73392,6 +73623,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "depq_0_4_2" = callPackage + ({ mkDerivation, base, containers, deepseq, hspec, psqueues + , QuickCheck + }: + mkDerivation { + pname = "depq"; + version = "0.4.2"; + sha256 = "18q953cr93qwjdblr06w8z4ryijzlz7j48hff4xwrdc3yrqk351l"; + libraryHaskellDepends = [ + base containers deepseq psqueues QuickCheck + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "Double-ended priority queues"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "deptrack-core" = callPackage ({ mkDerivation, base, containers, dlist, mtl, parsec }: mkDerivation { @@ -84929,6 +85177,8 @@ self: { pname = "envy"; version = "2.1.0.0"; sha256 = "0s6jp2npnp0x5hndnhkjwc9bhdghzlpl0n38804afiwxai9bawy8"; + revision = "1"; + editedCabalFile = "1girkgynrr5md1fa892cpg2cyy21hs5g463p5rb0fkhsnvci52xm"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -85008,20 +85258,18 @@ self: { }) {}; "epi-sim" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, hspec - , mwc-random, primitive, statistics, trifecta, vector + ({ mkDerivation, aeson, base, bytestring, hspec, mwc-random + , primitive, statistics, vector }: mkDerivation { pname = "epi-sim"; - version = "0.2.2.0"; - sha256 = "17pri7fynx5zi6hacglv2xww41837nrq0d355pv7rkvmqz5f8y3a"; + version = "0.4.2"; + sha256 = "0hwamynf66abhnipjdb292zpsf80hafpjjdv0yfq712qgjb9mgvp"; libraryHaskellDepends = [ - aeson base bytestring cassava hspec mwc-random primitive statistics - trifecta vector + aeson base bytestring hspec mwc-random primitive statistics vector ]; testHaskellDepends = [ - aeson base bytestring cassava hspec mwc-random primitive statistics - trifecta vector + aeson base bytestring hspec mwc-random primitive statistics vector ]; description = "A library for simulating epidemics as birth-death processes"; license = lib.licenses.mit; @@ -88339,6 +88587,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "express_0_1_4" = callPackage + ({ mkDerivation, base, leancheck, template-haskell }: + mkDerivation { + pname = "express"; + version = "0.1.4"; + sha256 = "0rhrlynb950n2c79s3gz0vyd6b34crlhzlva0w91qbzn9dpfrays"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base leancheck ]; + benchmarkHaskellDepends = [ base leancheck ]; + description = "Dynamically-typed expressions involving applications and variables"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "expression-parser" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -92506,6 +92768,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "fixed-length_0_2_2_1" = callPackage + ({ mkDerivation, base, non-empty, storable-record, tfp, utility-ht + }: + mkDerivation { + pname = "fixed-length"; + version = "0.2.2.1"; + sha256 = "123iyy1id86h0j45jyc9jiz24hvjw7j3l57iv80b57gv4hd8a6q7"; + libraryHaskellDepends = [ + base non-empty storable-record tfp utility-ht + ]; + description = "Lists with statically known length based on non-empty package"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fixed-list" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -98184,16 +98461,18 @@ self: { }) {}; "fuzzyfind" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, massiv, text + ({ mkDerivation, base, containers, criterion, deepseq, hspec + , massiv, QuickCheck, text }: mkDerivation { pname = "fuzzyfind"; - version = "2.1.0"; - sha256 = "0ah7kdbr2w0l06b28nprndx09fkdh5wk5sgl5gfb1f5iy090b8k1"; + version = "2.2.0"; + sha256 = "0rb96cd0lfk41gc5xc52adibjpi16xs82kifsymqykrpsgrgj525"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers massiv text ]; executableHaskellDepends = [ base criterion deepseq ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; description = "Fuzzy text matching"; license = lib.licenses.mit; }) {}; @@ -98554,8 +98833,8 @@ self: { }: mkDerivation { pname = "gamgee"; - version = "1.2.1"; - sha256 = "0kfaqxwnrpp9g6iz6s33b7lngw00l8n9bv9ssvw73dhh3r0rsj2b"; + version = "1.2.2"; + sha256 = "13mkdva9mchp48c5rc55c9h2l6iyc6phs46ncvy2053r1p8j31ki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98816,8 +99095,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "gc"; - version = "0.0.3"; - sha256 = "0cql0csrwqddpw28qmpr47mcnszmdc2szwvbnardr86pmjhvgwph"; + version = "0.1"; + sha256 = "1k8gda9hs0xl19hyl81ysshs32sxp5w50h3kq7id6yqvkfvyii5p"; + revision = "1"; + editedCabalFile = "0b5ry13gcrg9lxhn4crv911z6ibfm9ha2y942s455hw1pxkw279i"; libraryHaskellDepends = [ base ]; description = "Poor Richard's Memory Manager"; license = lib.licenses.bsd3; @@ -103021,29 +103302,30 @@ self: { license = lib.licenses.asl20; }) {}; - "ghcide_1_1_0_0" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, bytestring-encoding, case-insensitive - , containers, cryptohash-sha1, data-default, deepseq, dependent-map - , dependent-sum, Diff, directory, dlist, extra, filepath - , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check - , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob - , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb - , hls-plugin-api, hp2pretty, hslogger, implicit-hie - , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl - , network-uri, opentelemetry, optparse-applicative, parallel - , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck - , quickcheck-instances, record-dot-preprocessor, record-hasfield - , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions - , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , tasty-rerun, text, time, transformers, unix, unliftio - , unliftio-core, unordered-containers, utf8-string, vector, yaml + "ghcide_1_2_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, binary, bytestring, bytestring-encoding + , case-insensitive, containers, cryptohash-sha1, data-default + , deepseq, dependent-map, dependent-sum, Diff, directory, dlist + , extra, filepath, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events + , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable + , heapsize, hie-bios, hie-compat, hiedb, hls-plugin-api, hp2pretty + , hslogger, implicit-hie, implicit-hie-cradle, lens, lsp, lsp-test + , lsp-types, mtl, network-uri, opentelemetry, optparse-applicative + , parallel, prettyprinter, prettyprinter-ansi-terminal, process + , QuickCheck, quickcheck-instances, record-dot-preprocessor + , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe + , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple + , stm, syb, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-rerun, text, time, transformers, unix + , unliftio, unliftio-core, unordered-containers, utf8-string + , vector, yaml }: mkDerivation { pname = "ghcide"; - version = "1.1.0.0"; - sha256 = "1i2xyp2n4g4cpz50wpwmzmknrzqzxnv3b551ibmhdy41v2fh6y5l"; + version = "1.2.0.2"; + sha256 = "0r3n23i4b51bb92q6pch9knj079a26jbz0q70qfpv66154d00wld"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103051,27 +103333,29 @@ self: { bytestring-encoding case-insensitive containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths Glob haddock-library hashable - heapsize hie-bios hie-compat hiedb hls-plugin-api hslogger - implicit-hie-cradle lens lsp lsp-types mtl network-uri - opentelemetry parallel prettyprinter prettyprinter-ansi-terminal - regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake - sorted-list sqlite-simple stm syb text time transformers unix - unliftio unliftio-core unordered-containers utf8-string vector + ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob + haddock-library hashable heapsize hie-bios hie-compat hiedb + hls-plugin-api hslogger implicit-hie-cradle lens lsp lsp-types mtl + network-uri opentelemetry optparse-applicative parallel + prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie + rope-utf16-splay safe safe-exceptions shake sorted-list + sqlite-simple stm syb text time transformers unix unliftio + unliftio-core unordered-containers utf8-string vector ]; executableHaskellDepends = [ - aeson base bytestring containers data-default directory extra - filepath ghc gitrev hashable heapsize hie-bios hiedb hls-plugin-api - lens lsp lsp-test lsp-types optparse-applicative process - safe-exceptions shake text unordered-containers + aeson aeson-pretty base bytestring containers data-default + directory extra filepath ghc gitrev hashable heapsize hie-bios + hiedb hls-plugin-api lens lsp lsp-test lsp-types + optparse-applicative process safe-exceptions shake text + unordered-containers ]; testHaskellDepends = [ - aeson base binary bytestring containers data-default directory - extra filepath ghc ghc-typelits-knownnat haddock-library + aeson async base binary bytestring containers data-default + directory extra filepath ghc ghc-typelits-knownnat haddock-library hls-plugin-api lens lsp lsp-test lsp-types network-uri optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield rope-utf16-splay safe - safe-exceptions shake tasty tasty-expected-failure tasty-hunit + record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay + safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun text ]; testToolDepends = [ implicit-hie ]; @@ -103388,6 +103672,59 @@ self: { broken = true; }) {}; + "ghcup" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ascii-string, async, base + , base16-bytestring, binary, bytestring, bz2, case-insensitive + , casing, concurrent-output, containers, cryptohash-sha256 + , generic-arbitrary, generics-sop, haskus-utils-types + , haskus-utils-variant, hpath, hpath-directory, hpath-filepath + , hpath-io, hpath-posix, hspec, hspec-golden-aeson, libarchive + , lzma-static, megaparsec, monad-logger, mtl, optics, optics-vl + , optparse-applicative, os-release, parsec, pretty, pretty-terminal + , QuickCheck, quickcheck-arbitrary-adt, regex-posix, resourcet + , safe, safe-exceptions, split, streamly, streamly-bytestring + , streamly-posix, strict-base, string-interpolate, template-haskell + , text, time, transformers, unix, unix-bytestring + , unordered-containers, uri-bytestring, utf8-string, vector + , versions, vty, word8, yaml, zlib + }: + mkDerivation { + pname = "ghcup"; + version = "0.1.14.1"; + sha256 = "1lx6ahn4mvjzs3x4qm32sdn1n8w4v7jqj2jslvan008zk664d5l2"; + revision = "1"; + editedCabalFile = "0a9c2ha61mlz9ci652djy4vmmzi4s1g8rwl1a2miymrw5b36zsmq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ascii-string async base base16-bytestring binary bytestring + bz2 case-insensitive casing concurrent-output containers + cryptohash-sha256 generics-sop haskus-utils-types + haskus-utils-variant hpath hpath-directory hpath-filepath hpath-io + hpath-posix libarchive lzma-static megaparsec monad-logger mtl + optics optics-vl os-release parsec pretty pretty-terminal + regex-posix resourcet safe safe-exceptions split streamly + streamly-bytestring streamly-posix strict-base string-interpolate + template-haskell text time transformers unix unix-bytestring + unordered-containers uri-bytestring utf8-string vector versions vty + word8 yaml zlib + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring containers haskus-utils-variant + hpath hpath-filepath hpath-io libarchive megaparsec monad-logger + mtl optics optparse-applicative pretty pretty-terminal regex-posix + resourcet safe safe-exceptions string-interpolate template-haskell + text transformers uri-bytestring utf8-string versions yaml + ]; + testHaskellDepends = [ + base bytestring containers generic-arbitrary hpath hspec + hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt text + uri-bytestring versions + ]; + description = "ghc toolchain installer"; + license = lib.licenses.lgpl3Only; + }) {}; + "ghczdecode" = callPackage ({ mkDerivation, base, zenc }: mkDerivation { @@ -103731,21 +104068,21 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) gdk-pixbuf;}; - "gi-gdkpixbuf_2_0_25" = callPackage + "gi-gdkpixbuf_2_0_26" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers + , gi-gio, gi-glib, gi-gmodule, gi-gobject, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.25"; - sha256 = "18iz6rmqcf5q098hzv8p8hhk6ib8k99phmmnzp64j37c3x71c27b"; + version = "2.0.26"; + sha256 = "1g11pyrf1bzn0qrd9w52qhjq6qas4d3ycnprhwrglaffmaf0p9s8"; setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi + base Cabal gi-gio gi-glib gi-gmodule gi-gobject haskell-gi ]; libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers + base bytestring containers gi-gio gi-glib gi-gmodule gi-gobject + haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; @@ -103958,6 +104295,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; + "gi-gmodule" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib + , gmodule, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-gmodule"; + version = "2.0.1"; + sha256 = "16x0gpbs92l250ly9k52z6y85i78ycfsg0zbksfpsym4w45zjpbp"; + setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ gmodule ]; + description = "GModule bindings"; + license = lib.licenses.lgpl21Only; + }) {gmodule = null;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -106675,6 +107031,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "glabrous_2_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , cereal, cereal-text, directory, either, hspec, text + , unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "2.0.3"; + sha256 = "06bpazshc07rg1w06sl171k12mry708512hrdckqw7winwfrwwkh"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring cereal cereal-text + either text unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + description = "A template DSL library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "glade" = callPackage ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools , libglade @@ -116195,8 +116572,8 @@ self: { }: mkDerivation { pname = "hakyll-agda"; - version = "0.1.12"; - sha256 = "0fa2pw3zaqrxr2in3bb63w7wmch7345lmn84z25s80z0if9qv2x3"; + version = "0.1.13"; + sha256 = "1fylx5h0w774j0wwp3g1mhfyifiyrbclydipg9i8v98br9xcnspb"; libraryHaskellDepends = [ Agda base containers directory filepath hakyll mtl pandoc text transformers xhtml @@ -116626,19 +117003,22 @@ self: { "hal" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, envy - , exceptions, http-client, http-conduit, http-types, mtl, text - , time, unordered-containers + , exceptions, hspec, http-client, http-types, mtl, text, time + , unordered-containers }: mkDerivation { pname = "hal"; - version = "0.4.6"; - sha256 = "07xzkb9yavrh17d64gm3pc08jr8cb53lm5fdw6apcn7826ys76vh"; + version = "0.4.7"; + sha256 = "1bf2d4djbw8gpkcgrvjm52hsyw8hv20rsk0qdxfi8aml6mp152k5"; revision = "1"; - editedCabalFile = "01mx3i40i3xhn9i1bbdppp20df2l305zgzl9r4y02dfzcsy3xff5"; + editedCabalFile = "19hic5cgxyk2nz8nnrz091hv79al49q7ah9pv9d7fwagjzi027ch"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit - conduit-extra containers envy exceptions http-client http-conduit - http-types mtl text time unordered-containers + conduit-extra containers envy exceptions http-client http-types mtl + text time unordered-containers + ]; + testHaskellDepends = [ + aeson base containers hspec http-client http-types time ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = lib.licenses.bsd3; @@ -119660,8 +120040,8 @@ self: { }: mkDerivation { pname = "haskell-ci"; - version = "0.12"; - sha256 = "17ccxpsi483fkiyp98m09nzqds9n78y53naii5x18nvdxv9fssam"; + version = "0.12.1"; + sha256 = "0bdb3x2kk5nqm6ly2ycdpx6xw7pspgg67x73cjscqj6pxcx1wjzf"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -122509,8 +122889,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.6"; - sha256 = "19j4cvxnrqhckbyjnwg2z4ixavbkgcxlxspsxakawaffqhq49wq8"; + version = "0.52.8"; + sha256 = "14qwdh0fwyqhb3pgykprgp1vs78y4ixn2dn55bsi9x53cjjvp1qp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131493,6 +131873,26 @@ self: { broken = true; }) {}; + "hls-brittany-plugin" = callPackage + ({ mkDerivation, base, brittany, bytestring, filepath, ghc + , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens + , lsp-types, text, transformers + }: + mkDerivation { + pname = "hls-brittany-plugin"; + version = "1.0.0.1"; + sha256 = "1lfhgvxs0bvs67raxalvj8pr4qln1yvi7i7wlp33gpk2x89bwaqy"; + libraryHaskellDepends = [ + base brittany filepath ghc ghc-boot-th ghcide hls-plugin-api lens + lsp-types text transformers + ]; + testHaskellDepends = [ base bytestring hls-test-utils text ]; + description = "Integration with the Brittany code formatter"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {hls-test-utils = null;}; + "hls-class-plugin" = callPackage ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers @@ -131558,10 +131958,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.0.0"; - sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; - revision = "1"; - editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; + version = "1.0.0.1"; + sha256 = "1ygs667pkc3zn66yqz6ssrxifhrc906sddmcgjnkprk7zappk2nc"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-plugin-api lsp lsp-types shake text unordered-containers @@ -131615,8 +132013,8 @@ self: { }: mkDerivation { pname = "hls-plugin-api"; - version = "1.0.0.0"; - sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; + version = "1.1.0.0"; + sha256 = "1i18a5gxa409882zpviy4paldaq43j4z1zmgr9mag2mn64vplrxy"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff dlist hashable hslogger lens lsp opentelemetry process regex-tdfa @@ -131644,15 +132042,15 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-retrie-plugin_1_0_0_1" = callPackage + "hls-retrie-plugin_1_0_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie , safe-exceptions, shake, text, transformers, unordered-containers }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.0.1"; - sha256 = "0vshnnh8x2n0kn7hh04z00mkdmw3130b3mmfrm3z4ygia852hzmq"; + version = "1.0.0.2"; + sha256 = "0jw1q0dk5jl80wbyvi1a6vszj9x3s7d2bnsbnyycbh4zgl33agwb"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions shake text @@ -141168,22 +141566,23 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_6" = callPackage + "http-client_0_7_7" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , http-types, mime-types, monad-control, network, network-uri - , random, stm, streaming-commons, text, time, transformers, zlib + , http-types, iproute, mime-types, monad-control, network + , network-uri, random, stm, streaming-commons, text, time + , transformers, zlib }: mkDerivation { pname = "http-client"; - version = "0.7.6"; - sha256 = "1458mq5kh5fjlkhk9cgaz6sc6533l2nm4r2jz80diy8qc6bpiwrk"; + version = "0.7.7"; + sha256 = "0sbjfxfnj5b594klc7h7zmw27gssrbcsacld9lw9p0bpmgx73lvn"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types mime-types network network-uri random stm - streaming-commons text time transformers + ghc-prim http-types iproute mime-types network network-uri random + stm streaming-commons text time transformers ]; testHaskellDepends = [ async base blaze-builder bytestring case-insensitive containers @@ -145639,8 +146038,8 @@ self: { ({ mkDerivation, base, containers, QuickCheck, text }: mkDerivation { pname = "hzenhan"; - version = "0.0.4"; - sha256 = "1gbrzjjdihgzj63sp2h4762zybyhd5rxa8rpvsjra21qvvch12mx"; + version = "0.0.5"; + sha256 = "1zrxcbazask9dg9rqkdfkm8q055p1wl9834a3yslyxq0h39acc61"; libraryHaskellDepends = [ base containers text ]; testHaskellDepends = [ base containers QuickCheck text ]; description = "Zenhan library for Haskell"; @@ -151114,22 +151513,20 @@ self: { "ircbot" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath - , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix + , irc, mtl, network, optparse-applicative, parsec, random + , SafeSemaphore, stm, time, unix }: mkDerivation { pname = "ircbot"; - version = "0.6.6"; - sha256 = "1nmqgimmmxry4pj1y5mfsp662hkivn0vr9n8rx1yn0aldlzrxdm8"; + version = "0.6.6.1"; + sha256 = "00dw9ay5x4hb8p2jvxwgcxqlny7cpm6lk5kqaw9yc9c6m6705fqc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers directory filepath irc mtl network - parsec random SafeSemaphore stm time unix - ]; - executableHaskellDepends = [ - base bytestring containers directory filepath irc mtl network - parsec random SafeSemaphore stm time unix + optparse-applicative parsec random SafeSemaphore stm time unix ]; + executableHaskellDepends = [ base ]; description = "A library for writing IRC bots"; license = lib.licenses.bsd3; }) {}; @@ -157686,8 +158083,6 @@ self: { ]; description = "Krank checks your code source comments for important markers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "krapsh" = callPackage @@ -169725,8 +170120,8 @@ self: { }) {}; "lzma" = callPackage - ({ mkDerivation, base, bytestring, HUnit, lzma, QuickCheck, tasty - , tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, xz }: mkDerivation { pname = "lzma"; @@ -169735,13 +170130,13 @@ self: { revision = "6"; editedCabalFile = "1sh2g5wkh0m6646cxnii0k20f0crwdcnprfl9jfg7gxn5875bkip"; libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ lzma ]; + librarySystemDepends = [ xz ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "LZMA/XZ compression and decompression"; license = lib.licenses.bsd3; - }) {lzma = null;}; + }) {inherit (pkgs) xz;}; "lzma-clib" = callPackage ({ mkDerivation }: @@ -169777,8 +170172,8 @@ self: { "lzma-enumerator" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit - , lzma, mtl, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , mtl, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, xz }: mkDerivation { pname = "lzma-enumerator"; @@ -169787,7 +170182,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL bytestring enumerator mtl ]; - librarySystemDepends = [ lzma ]; + librarySystemDepends = [ xz ]; testHaskellDepends = [ base bytestring enumerator HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 @@ -169796,7 +170191,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {lzma = null;}; + }) {inherit (pkgs) xz;}; "lzma-static" = callPackage ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty @@ -169804,8 +170199,8 @@ self: { }: mkDerivation { pname = "lzma-static"; - version = "5.2.5.1"; - sha256 = "1hky1aa1bl6zxnhwgpghx1wf43g74x6f4xpi21l65a39sb25bqf0"; + version = "5.2.5.2"; + sha256 = "12na1ycwrd7p50g19kgnb6kdgswnkwgzynaf0lyrv30qicpd8a5z"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -173101,6 +173496,21 @@ self: { broken = true; }) {}; + "mcaeson" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mcaeson"; + version = "0.0.0.1"; + sha256 = "0gkwqkyp5apwkzlqwm4h1fy112fy2ywg5qq2ma4s5agz9574h73q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "An Aeson parsing toolkit"; + license = lib.licenses.bsd3; + }) {}; + "mcl" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, criterion , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl @@ -177468,6 +177878,28 @@ self: { license = lib.licenses.mit; }) {}; + "mod_0_1_2_2" = callPackage + ({ mkDerivation, base, deepseq, integer-gmp, primitive + , quickcheck-classes, quickcheck-classes-base, semirings, tasty + , tasty-bench, tasty-quickcheck, vector + }: + mkDerivation { + pname = "mod"; + version = "0.1.2.2"; + sha256 = "0m92yd323kjjwnphqlima2aj0hh7i1gnpblc8a29ks25gj0sv66v"; + libraryHaskellDepends = [ + base deepseq integer-gmp primitive semirings vector + ]; + testHaskellDepends = [ + base primitive quickcheck-classes quickcheck-classes-base semirings + tasty tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ base tasty-bench ]; + description = "Fast type-safe modular arithmetic"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "modbus-tcp" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, transformers }: mkDerivation { @@ -189169,6 +189601,19 @@ self: { license = lib.licenses.mit; }) {}; + "nonempty-zipper_1_0_0_2" = callPackage + ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }: + mkDerivation { + pname = "nonempty-zipper"; + version = "1.0.0.2"; + sha256 = "10fj56ry851npkhrkw9gb1sckhx764l2s2c5x83cnylxlg7cfijj"; + libraryHaskellDepends = [ base comonad deepseq safe ]; + testHaskellDepends = [ base comonad deepseq doctest Glob safe ]; + description = "A non-empty comonadic list zipper"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "nonemptymap" = callPackage ({ mkDerivation, base, containers, semigroupoids }: mkDerivation { @@ -189714,6 +190159,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-prelude_0_5_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base + , bytestring, containers, directory, exceptions, filepath, ghc + , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text + , safe-exceptions, terminal-size, text, time, vector + }: + mkDerivation { + pname = "nri-prelude"; + version = "0.5.0.3"; + sha256 = "0k4mhgyazjc74hwf2xgznhhkryqhdmsc2pv1v9d32706qkr796wn"; + libraryHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-exceptions terminal-size text + time vector + ]; + testHaskellDepends = [ + aeson aeson-pretty async auto-update base bytestring containers + directory exceptions filepath ghc hedgehog junit-xml pretty-diff + pretty-show safe-coloured-text safe-exceptions terminal-size text + time vector + ]; + description = "A Prelude inspired by the Elm programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nsis" = callPackage ({ mkDerivation, base, directory, process, transformers, uniplate }: @@ -204226,6 +204698,8 @@ self: { pname = "pixiv"; version = "0.1.0"; sha256 = "001pfzijh7ibcyinmw0l8yvw0kxsvmniw993qx9b6zlzf689cpp6"; + revision = "1"; + editedCabalFile = "03wfjj0a074n02mpa02gncfy35m53qdmij465dk8g6qjnjah8a01"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash-md5 directory exceptions filepath http-client http-client-tls lens monad-control @@ -215124,6 +215598,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-classes_0_6_5_0" = callPackage + ({ mkDerivation, aeson, base, base-orphans, containers, primitive + , primitive-addr, QuickCheck, quickcheck-classes-base + , semigroupoids, semirings, tagged, tasty, tasty-quickcheck + , transformers, vector + }: + mkDerivation { + pname = "quickcheck-classes"; + version = "0.6.5.0"; + sha256 = "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"; + libraryHaskellDepends = [ + aeson base containers primitive primitive-addr QuickCheck + quickcheck-classes-base semigroupoids semirings transformers vector + ]; + testHaskellDepends = [ + aeson base base-orphans containers primitive QuickCheck + semigroupoids tagged tasty tasty-quickcheck transformers vector + ]; + description = "QuickCheck common typeclasses"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-classes-base" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, containers , contravariant, fail, QuickCheck, tagged, transformers @@ -215140,6 +215637,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "quickcheck-classes-base_0_6_2_0" = callPackage + ({ mkDerivation, base, containers, QuickCheck, transformers }: + mkDerivation { + pname = "quickcheck-classes-base"; + version = "0.6.2.0"; + sha256 = "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"; + libraryHaskellDepends = [ + base containers QuickCheck transformers + ]; + description = "QuickCheck common typeclasses from `base`"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-combinators" = callPackage ({ mkDerivation, base, QuickCheck, unfoldable-restricted }: mkDerivation { @@ -228041,6 +228552,30 @@ self: { license = lib.licenses.publicDomain; }) {}; + "safecopy_0_10_4_2" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , generic-data, HUnit, lens, lens-action, old-time, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, template-haskell + , text, time, transformers, vector + }: + mkDerivation { + pname = "safecopy"; + version = "0.10.4.2"; + sha256 = "0r2mf0p82gf8vnldx477b5ykrj1x7hyg13nqfn6gzb50japs6h3i"; + libraryHaskellDepends = [ + array base bytestring cereal containers generic-data old-time + template-haskell text time transformers vector + ]; + testHaskellDepends = [ + array base bytestring cereal containers HUnit lens lens-action + QuickCheck quickcheck-instances tasty tasty-quickcheck + template-haskell time vector + ]; + description = "Binary serialization with version control"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "safecopy-migrate" = callPackage ({ mkDerivation, base, base-prelude, cereal, containers, extra , haskell-src-meta, microlens, safecopy, template-haskell @@ -228254,8 +228789,8 @@ self: { }: mkDerivation { pname = "sak"; - version = "0.1.3.0"; - sha256 = "1khws0z9v91vz722k6y0b99ffy2vd04myvpww4p1i32396dhczln"; + version = "0.1.3.1"; + sha256 = "12vharmp5f0ffxy4j5kjwqnffc87y4wmzvgcfvp6prqyjfh87qfy"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -228706,6 +229241,122 @@ self: { broken = true; }) {}; + "sandwich" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, base, brick + , bytestring, colour, containers, directory, exceptions, filepath + , free, haskell-src-exts, lens, lifted-async, microlens + , microlens-th, monad-control, monad-logger, mtl + , optparse-applicative, pretty-show, process, safe, safe-exceptions + , stm, string-interpolate, template-haskell, text, time + , transformers, transformers-base, unix, unliftio-core, vector, vty + }: + mkDerivation { + pname = "sandwich"; + version = "0.1.0.2"; + sha256 = "1xcw3mdl85brj6pvynz58aclaf3ya0aq0y038cps9dsz58bqhbka"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + executableHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + testHaskellDepends = [ + aeson ansi-terminal async base brick bytestring colour containers + directory exceptions filepath free haskell-src-exts lens + lifted-async microlens microlens-th monad-control monad-logger mtl + optparse-applicative pretty-show process safe safe-exceptions stm + string-interpolate template-haskell text time transformers + transformers-base unix unliftio-core vector vty + ]; + description = "Yet another test framework for Haskell"; + license = lib.licenses.bsd3; + }) {}; + + "sandwich-slack" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, lens + , lens-aeson, monad-logger, mtl, safe, safe-exceptions, sandwich + , stm, string-interpolate, text, time, vector, wreq + }: + mkDerivation { + pname = "sandwich-slack"; + version = "0.1.0.1"; + sha256 = "1c7csrdfq342733rgrfwx5rc6v14jhfb9wb44gn699pgzzj031kz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + executableHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers lens lens-aeson monad-logger mtl + safe safe-exceptions sandwich stm string-interpolate text time + vector wreq + ]; + description = "Sandwich integration with Slack"; + license = lib.licenses.bsd3; + }) {}; + + "sandwich-webdriver" = callPackage + ({ mkDerivation, aeson, base, containers, convertible, data-default + , directory, exceptions, filepath, http-client, http-client-tls + , http-conduit, lifted-base, microlens, microlens-aeson + , monad-control, monad-logger, mtl, network, process, random, retry + , safe, safe-exceptions, sandwich, string-interpolate, temporary + , text, time, transformers, unix, unordered-containers, vector + , webdriver, X11 + }: + mkDerivation { + pname = "sandwich-webdriver"; + version = "0.1.0.1"; + sha256 = "10s0zb3al4ii9gm3b6by8czvr8i3s424mlfk81v2hpdv5i7a0yqb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + executableHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + testHaskellDepends = [ + aeson base containers convertible data-default directory exceptions + filepath http-client http-client-tls http-conduit lifted-base + microlens microlens-aeson monad-control monad-logger mtl network + process random retry safe safe-exceptions sandwich + string-interpolate temporary text time transformers unix + unordered-containers vector webdriver X11 + ]; + description = "Sandwich integration with Selenium WebDriver"; + license = lib.licenses.bsd3; + }) {}; + "sarasvati" = callPackage ({ mkDerivation, base, deepseq, portaudio }: mkDerivation { @@ -240504,8 +241155,8 @@ self: { ({ mkDerivation, base, containers, lucid, skylighting-core, text }: mkDerivation { pname = "skylighting-lucid"; - version = "1.0.0"; - sha256 = "09wh0dh8glnb051hdbcf4q4v3nflikgc585acqin8kq7zny7ps72"; + version = "1.0.1"; + sha256 = "0igimymq8pcizl4wdmyjafjgdw8xi2059jzmcw64ij18rn6bip8d"; libraryHaskellDepends = [ base containers lucid skylighting-core text ]; @@ -242902,18 +243553,18 @@ self: { "snaplet-redis" = callPackage ({ mkDerivation, base, bytestring, cereal, clientsession - , configurator, hedis, lens, mtl, network, snap, snap-core, text - , time, transformers, unordered-containers + , configurator, hedis, lens, mtl, snap, snap-core, text, time + , unordered-containers }: mkDerivation { pname = "snaplet-redis"; - version = "0.1.6"; - sha256 = "09ba0jmbjk121c2cvnd83328w9h2d5rzwvmpxs2pi93x6jqpd9qw"; + version = "0.1.6.1"; + sha256 = "07wwh2gpbsg60p0a4qxf4knbchpq7bvh8bdckzw5f39k5xcaibsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal clientsession configurator hedis lens mtl - network snap snap-core text time transformers unordered-containers + snap snap-core text time unordered-containers ]; description = "Redis support for Snap Framework"; license = lib.licenses.bsd3; @@ -244149,6 +244800,29 @@ self: { broken = true; }) {}; + "souffle-dsl" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hedgehog + , hspec, hspec-hedgehog, mtl, neat-interpolation, process + , souffle-haskell, template-haskell, temporary, text + , type-errors-pretty + }: + mkDerivation { + pname = "souffle-dsl"; + version = "0.1.0"; + sha256 = "1j3g4nwl0v5szphvyv0jp7qcmnpfmynr8dbkwwh4lwacldgnhbnr"; + libraryHaskellDepends = [ + base containers directory filepath mtl process souffle-haskell + template-haskell temporary text type-errors-pretty + ]; + testHaskellDepends = [ + base containers directory filepath hedgehog hspec hspec-hedgehog + mtl neat-interpolation process souffle-haskell template-haskell + temporary text type-errors-pretty + ]; + description = "Haskell EDSL for Souffle"; + license = lib.licenses.mit; + }) {}; + "souffle-haskell" = callPackage ({ mkDerivation, array, base, containers, deepseq, directory , filepath, hedgehog, hspec, hspec-hedgehog, mtl @@ -244734,6 +245408,24 @@ self: { broken = true; }) {}; + "spartacon" = callPackage + ({ mkDerivation, base, config-schema, config-value, containers + , either, mtl, relation, text, X11 + }: + mkDerivation { + pname = "spartacon"; + version = "0.1.0.0"; + sha256 = "1mabp5gfwj7zv30rdnr1zwl4fv29128vg08izjcj8sym0hldzj81"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base config-schema config-value containers either mtl relation text + X11 + ]; + description = "A unix-style (read from stdin, write to stdout) global hotkey daemon"; + license = lib.licenses.bsd3; + }) {}; + "spata" = callPackage ({ mkDerivation, base, dlist, mps, mtl }: mkDerivation { @@ -244974,6 +245666,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "speculate_0_4_4" = callPackage + ({ mkDerivation, base, cmdargs, containers, express, leancheck }: + mkDerivation { + pname = "speculate"; + version = "0.4.4"; + sha256 = "0vmxi8rapbld7b3llw2v6fz1v6vqyv90rpbnzjdfa29kdza4m5sf"; + libraryHaskellDepends = [ + base cmdargs containers express leancheck + ]; + testHaskellDepends = [ base express leancheck ]; + benchmarkHaskellDepends = [ base express leancheck ]; + description = "discovery of properties about Haskell functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "speculation" = callPackage ({ mkDerivation, base, ghc-prim, stm, transformers }: mkDerivation { @@ -256253,6 +256961,8 @@ self: { pname = "tasty-bench"; version = "0.2.5"; sha256 = "146i1vkp9008hik7qyi8m9qq3ij5kji84qscsf598rzjmjga7igd"; + revision = "1"; + editedCabalFile = "0rcsdiwri52wng5dj30k3c5qrn8qfr14qs53cs1y99mbqfpzs02g"; libraryHaskellDepends = [ base containers deepseq tasty ]; description = "Featherlight benchmark framework"; license = lib.licenses.mit; @@ -258757,8 +259467,8 @@ self: { }: mkDerivation { pname = "tesla"; - version = "0.3.1.0"; - sha256 = "1fwrhmxqpliyq92v1j6jcqxi5iyh7s8rj17mybvgkwh5aprwsdp8"; + version = "0.4.1.0"; + sha256 = "0rnzgcwkgwnpjlf2r47a28zwkbnsb75wfmdiwnq4w99i2f519dnd"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers cryptonite exceptions generic-deriving lens lens-aeson memory @@ -260148,6 +260858,23 @@ self: { license = lib.licenses.asl20; }) {}; + "text-regex-replace_0_1_1_4" = callPackage + ({ mkDerivation, attoparsec, base, hspec, QuickCheck, smallcheck + , text, text-icu + }: + mkDerivation { + pname = "text-regex-replace"; + version = "0.1.1.4"; + sha256 = "19n7zwnrm4da8ifhwlqwrx969pni0njj5f69j30gp71fi9ihjgsb"; + libraryHaskellDepends = [ attoparsec base text text-icu ]; + testHaskellDepends = [ + base hspec QuickCheck smallcheck text text-icu + ]; + description = "Easy replacement when using text-icu regexes"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "text-region" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , groups, hspec, lens, text @@ -262228,6 +262955,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "tidal_1_7_3" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, network, parsec + , primitive, random, text, transformers, weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.7.3"; + sha256 = "0z0brlicisn7xpwag20vdrq6ympczxcyd886pm6am5phmifkmfif"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + network parsec primitive random text transformers + ]; + testHaskellDepends = [ + base containers deepseq hosc microspec parsec + ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -265349,6 +266099,8 @@ self: { pname = "trackit"; version = "0.7.2"; sha256 = "1ha28wdc4dabr9qxkbpg9fasfnplicb2pyrn9zmija204nigbcdj"; + revision = "1"; + editedCabalFile = "0l9hi5f90nixayzahksgxrs4zij76767x64irql890ph6qzsq13c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -275438,6 +276190,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "vector-binary-instances_0_2_5_2" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, tasty + , tasty-bench, tasty-quickcheck, vector + }: + mkDerivation { + pname = "vector-binary-instances"; + version = "0.2.5.2"; + sha256 = "0kgmlb4rf89b18d348cf2k06xfhdpamhmvq7iz5pab5014hknbmp"; + libraryHaskellDepends = [ base binary vector ]; + testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; + benchmarkHaskellDepends = [ + base binary bytestring deepseq tasty-bench vector + ]; + description = "Instances of Data.Binary for vector"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vector-buffer" = callPackage ({ mkDerivation, base, deepseq, vector }: mkDerivation { @@ -288994,6 +289764,32 @@ self: { broken = true; }) {}; + "yesod-page-cursor_2_0_0_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "2.0.0.6"; + sha256 = "0if4pwpzpr48cz1vixk234fdl4lj3895ma9ak8x917sc3cgp2kv1"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { From bfe415121972683c4b78666679198c5336fa6095 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 02:01:52 +0800 Subject: [PATCH 09/57] dotnetCorePackages.sdk_5_0: 5.0.200 -> 5.0.202 This fix NuGet issue https://github.com/NuGet/Home/issues/10491 --- pkgs/development/compilers/dotnet/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 143782d9301e..f78c546542a2 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,9 @@ /* How to combine packages for use in development: dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_3_0 sdk aspnetcore_2_1 ]; + +Hashes below are retrived from: +https://dotnet.microsoft.com/download/dotnet */ { callPackage }: let @@ -124,11 +127,11 @@ rec { }; sdk_5_0 = buildNetCoreSdk { - version = "5.0.200"; + version = "5.0.202"; sha512 = { - x86_64-linux = "0g7zcmkcdwc11h42m6hq8d0w55nnvnsmj3dc16829q55cp7l7kggmjljnd9slx7r7nrsyi7yy8brwh8n4kfi5998pdyb09fzhq5w60d"; - aarch64-linux = "2zy6nxiw313g2sbmnkg76r64llbk2w2wcsa6frq535zbviw52zf163jvw2687rpiw4szdizf337l3b0qa0396abw5dhq2czqlxjyjv8"; - x86_64-darwin = "2p0yxplafhi5ks38pq8nyi43kpv4l4npa718rvcvl57qs76j0dqlk1s4wdw7msx8g7xxy1aal47zy9rxvlypmgwx4dnp339cmbd6mf6"; + x86_64-linux = "Ae1Z8jYYSYdAVnPSSUDVXOKdgw59u8GVVv3AOJMDnmBGcS3m+QHcmREEeg3uT9FTGbfpT4ox32uYH6Nb2T2YOA=="; + aarch64-linux = "JuwSWgY35xrK0gOGR034mhAemulIkhtd4M00P0vA6EtOeyMY4Vl4cj6zudMh6Jt5DD8EJKQ8KbABX8byuePp2Q=="; + x86_64-darwin = "jxnfTbQUb0dJ2/NX2pu8Pi/F/e4EaDm2Ta5U+6sSYj/s6nNp6NHxtEn7BzhQ9/EVLszl/oXi3lL0d/BPbzldEA=="; }; }; } From 939dc2da35268521eee29a605fd8d9c3b1fc6d75 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 02:04:16 +0800 Subject: [PATCH 10/57] osu-lazer: 2021.331.0 -> 2021.410.0 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 28 ++++++++++++++-------------- pkgs/games/osu-lazer/update.sh | 15 +-------------- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 2d90dafb28dc..81f50e968223 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.331.0"; + version = "2021.410.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "dCKBxVDBBhJ7LEawmMOU7PKh0yxmDgVw6PL2F0qA5RU="; + sha256 = "twKg9iZdY+zgwEQeHMOlRZKXxAHic7GnoqH0jOdW7fw="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index a956f9efb2e3..f30ac9b13f4b 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -261,8 +261,8 @@ }) (fetchNuGet { name = "JetBrains.Annotations"; - version = "2020.3.0"; - sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; + version = "2021.1.0"; + sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) (fetchNuGet { name = "ManagedBass"; @@ -296,8 +296,8 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; + version = "5.0.5"; + sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; @@ -551,8 +551,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; - version = "5.0.4"; - sha256 = "07kyqbm7f7k4bv3fa54b826b87z00385pqgjzd4s8l26j6p39rrm"; + version = "5.0.5"; + sha256 = "0hh0xm14hp479dsd0gb9igz0vbbn3sak27v39phpyilxvk7ky5z1"; }) (fetchNuGet { name = "Microsoft.Extensions.Options"; @@ -576,8 +576,8 @@ }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; + version = "5.0.5"; + sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -721,8 +721,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.330.0"; - sha256 = "01v319nd9szq5z5qq6pa348y1mv93pnhw0vrgbrjwvcs797h7mjl"; + version = "2021.410.0"; + sha256 = "1vwdrspdpal44hyspv3rsax8mkszvbnc2xl1xswczx9mzj6qs4by"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -731,8 +731,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2021.211.1"; - sha256 = "0rqv5blmyzvcpk0b1r6fzr1bla62kr2fwkr1f9ahir9zafvk2wmm"; + version = "2021.410.0"; + sha256 = "1a5qia4595n0b21dj63sl71ar56m9x1glqwky7a9bb0dqpvfivya"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; @@ -741,8 +741,8 @@ }) (fetchNuGet { name = "ppy.SDL2-CS"; - version = "1.0.82"; - sha256 = "0hdfih1hjpqxgblwc947inyfhskkj85f061cagf8gdl69xsp2l1b"; + version = "1.0.225-alpha"; + sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc"; }) (fetchNuGet { name = "ppy.squirrel.windows"; diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index 44a4bb3821db..b5c8208fe41b 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -22,21 +22,8 @@ chmod -R +w "$src" pushd "$src" -# Setup empty nuget package folder to force reinstall. mkdir ./nuget_tmp.packages -cat >./nuget_tmp.config < - - - - - - - - -EOF - -dotnet restore osu.Desktop --configfile ./nuget_tmp.config --runtime linux-x64 +dotnet restore osu.Desktop --packages ./nuget_tmp.packages --runtime linux-x64 echo "{ fetchNuGet }: [" >"$deps_file" while read pkg_spec; do From 1d2ea5bceb7c9696b66986396a2287b512ede1a0 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 03:24:18 +0800 Subject: [PATCH 11/57] roslyn: regenerate deps --- pkgs/development/compilers/roslyn/deps.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index 0afb482350b1..deb72e522cdc 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -137,10 +137,10 @@ } { name = "microsoft.netcore.app.host.linux-x64"; - version = "3.1.12"; + version = "3.1.14"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.12/microsoft.netcore.app.host.linux-x64.3.1.12.nupkg"; - sha256 = "1kp1sb7n1sb012v4k1xfv97n0x7k5r2rn0za8y8nbxjb2a4i4a8n"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.14/microsoft.netcore.app.host.linux-x64.3.1.14.nupkg"; + sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; }; } { From 5bea018a9c223c377757582bb7f2572291850716 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 15 Apr 2021 03:43:24 +0800 Subject: [PATCH 12/57] ryujinx: 1.0.6807 -> 1.0.6835 --- pkgs/misc/emulators/ryujinx/default.nix | 6 +- pkgs/misc/emulators/ryujinx/deps.nix | 416 ++++++++++++------------ 2 files changed, 206 insertions(+), 216 deletions(-) diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 8bad6b3cd9e7..db3b87b7b59e 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -16,13 +16,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6807"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.6835"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "0ee314fb3b9d476d0d207a3595bde24af9c4b69b"; - sha256 = "1yyjy5qblsdg186hr81qpc07n0cqla67q3hjf2rrzq5pyb10bldy"; + rev = "e520eecb5ba682d4b51bb782e3bc99fb1d6afe04"; + sha256 = "1yy1xslnvvl0m7g0jszj2pjwdwf0pbv53crzfkhla3n68kvfy00f"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index 5e3f1a4944f8..1ccd7c9b38fe 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -45,20 +45,15 @@ sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { - name = "GLWidget"; - version = "1.0.2"; - sha256 = "0nb46jiscnsywwdfy7zhx1bw4jfmca3s6l8dhbi99gc4bvp8ar7p"; + name = "GtkSharp"; + version = "3.22.25.128"; + sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { - name = "GtkSharp"; - version = "3.22.25.128"; - sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; - }) (fetchNuGet { name = "LibHac"; version = "0.12.0"; @@ -66,18 +61,18 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "14njzl0907wzcbsnxl62m4y6mv9pdirm68bj8qbbip0q5a6xgidw"; + version = "5.0.5"; + sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "5.0.0"; - sha256 = "1mmklq1fwq4km9y9jgk63wmwjlarx4npkpvjaiwdzv83vdv104ja"; + version = "5.0.5"; + sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "5.0.0"; - sha256 = "0k7q89w3nky4m0j5jsk95c8gczlyp5jl9982gf1hli3gqpl2q4jr"; + version = "5.0.5"; + sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; @@ -94,35 +89,30 @@ version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.8.0"; - sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; - }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "5.0.0"; - sha256 = "1nirb155gzn2ws1ayaqspjmjaizw87jq2684mzkn18jv4si0hbpf"; + version = "5.0.5"; + sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; - version = "5.0.0"; - sha256 = "0nghghcapc28ixg21wb30ccjirc9wz83h0y3bn5zyfanxv2m2ypx"; + version = "5.0.5"; + sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "5.0.0"; - sha256 = "1k9yxklzdnjfkqysg54dz0mr75yg29fhlls9alh5qlfpsfpk32yq"; + version = "5.0.5"; + sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "5.0.0"; - sha256 = "0lvpf4zz617y94zz3zsmzrg6zcdd6z3z9gz2bd5kq1l8y1pmq77y"; + version = "5.0.5"; + sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "5.0.0"; - sha256 = "1486654z369857h45v73jz8pwr8ibb97fiw5mfm7f01kdbyjdsdd"; + version = "5.0.5"; + sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -139,11 +129,6 @@ version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; - }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; @@ -159,6 +144,11 @@ version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { + name = "Microsoft.NET.Test.Sdk"; + version = "16.8.0"; + sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; + }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.0"; @@ -189,21 +179,11 @@ version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.7.0"; - sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; - }) (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { - name = "Microsoft.Win32.SystemEvents"; - version = "4.5.0"; - sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; - }) (fetchNuGet { name = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; @@ -255,15 +235,35 @@ sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) (fetchNuGet { - name = "OpenTK.NetStandard"; - version = "1.0.5.32"; - sha256 = "12y8kg73llmq3zibcp6j3hhiw04g7mqlm1nslmb74gfkzx0b4m9f"; + name = "OpenTK.Core"; + version = "4.5.0"; + sha256 = "06qxczikp0aah20d4skk3g588dgh2vn2xffn0ajyyv0475m61s9m"; + }) + (fetchNuGet { + name = "OpenTK.Graphics"; + version = "4.5.0"; + sha256 = "180g5c92fhhhpmwl6paihx4h1bil7akaihlz2qy124n28pf4s988"; + }) + (fetchNuGet { + name = "OpenTK.Mathematics"; + version = "4.5.0"; + sha256 = "1h9dxhq1llxdbgdzsi87ijqgj2ilr3rv0zkxhaa65xrc5x8j8fva"; + }) + (fetchNuGet { + name = "OpenTK.OpenAL"; + version = "4.5.0"; + sha256 = "0lqxpc3vnxglql42x2frvq5bpkl5cf3dpnf9nx6pr3q6qnhigkfb"; }) (fetchNuGet { name = "PangoSharp"; version = "3.22.25.128"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) + (fetchNuGet { + name = "ppy.SDL2-CS"; + version = "1.0.225-alpha"; + sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc"; + }) (fetchNuGet { name = "runtime.any.System.Collections"; version = "4.3.0"; @@ -279,21 +279,26 @@ version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) (fetchNuGet { name = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { + name = "runtime.any.System.Globalization.Calendars"; + version = "4.3.0"; + sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; + }) (fetchNuGet { name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { + name = "runtime.any.System.Reflection"; + version = "4.3.0"; + sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; + }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; @@ -304,16 +309,16 @@ version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { + name = "runtime.any.System.Runtime"; + version = "4.3.0"; + sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; @@ -325,20 +330,15 @@ sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) (fetchNuGet { - name = "runtime.any.System.Runtime"; + name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; + sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; @@ -364,6 +364,16 @@ version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + }) + (fetchNuGet { + name = "runtime.native.System"; + version = "4.3.0"; + sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + }) (fetchNuGet { name = "runtime.native.System.IO.Compression"; version = "4.1.0"; @@ -374,25 +384,15 @@ version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) (fetchNuGet { name = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; - }) - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; + sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) (fetchNuGet { name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; @@ -524,15 +524,20 @@ version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) + (fetchNuGet { + name = "SixLabors.ImageSharp"; + version = "1.0.2"; + sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + }) (fetchNuGet { name = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) (fetchNuGet { - name = "SixLabors.ImageSharp"; - version = "1.0.2"; - sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; + name = "SPB"; + version = "0.0.2"; + sha256 = "178z9mi7zlk0laj79nkjh75ych47jjajiaj33hnh7zfmz05d8h6r"; }) (fetchNuGet { name = "System.AppContext"; @@ -559,6 +564,16 @@ version = "5.0.0"; sha256 = "14zs2wqkmdlxzj8ikx19n321lsbarx5vl2a8wrachymxn8zb5njh"; }) + (fetchNuGet { + name = "System.Collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + }) + (fetchNuGet { + name = "System.Collections"; + version = "4.3.0"; + sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + }) (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.0.12"; @@ -575,14 +590,9 @@ sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; - }) - (fetchNuGet { - name = "System.Collections"; + name = "System.ComponentModel"; version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; @@ -599,11 +609,6 @@ version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; - }) (fetchNuGet { name = "System.Console"; version = "4.0.0"; @@ -644,11 +649,6 @@ version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - name = "System.Drawing.Common"; - version = "4.5.0"; - sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; - }) (fetchNuGet { name = "System.Drawing.Common"; version = "5.0.1"; @@ -659,6 +659,16 @@ version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + }) + (fetchNuGet { + name = "System.Globalization"; + version = "4.3.0"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + }) (fetchNuGet { name = "System.Globalization.Calendars"; version = "4.0.1"; @@ -675,19 +685,14 @@ sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + name = "System.IO"; + version = "4.1.0"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { - name = "System.Globalization"; + name = "System.IO"; version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { name = "System.IO.Compression"; @@ -695,14 +700,9 @@ sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "System.IO.Compression.ZipFile"; version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; - }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { name = "System.IO.FileSystem"; @@ -715,19 +715,14 @@ sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { - name = "System.IO"; - version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + name = "System.IO.FileSystem.Primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { - name = "System.IO"; + name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { name = "System.Linq"; @@ -739,6 +734,11 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { + name = "System.Linq.Expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) (fetchNuGet { name = "System.Management"; version = "5.0.0"; @@ -784,6 +784,26 @@ version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + }) + (fetchNuGet { + name = "System.Reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.0.1"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + }) + (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + }) (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; @@ -804,16 +824,6 @@ version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; - }) - (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) (fetchNuGet { name = "System.Reflection.Extensions"; version = "4.0.1"; @@ -844,16 +854,6 @@ version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; - }) - (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.0.1"; @@ -864,6 +864,16 @@ version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + }) + (fetchNuGet { + name = "System.Runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; + }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; @@ -894,16 +904,6 @@ version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; - }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.3.0"; - sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; - }) (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.1.0"; @@ -914,6 +914,16 @@ version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + }) + (fetchNuGet { + name = "System.Runtime.InteropServices.RuntimeInformation"; + version = "4.3.0"; + sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; + }) (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; @@ -924,26 +934,11 @@ version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; - }) - (fetchNuGet { - name = "System.Runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.7.0"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; - }) (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; @@ -989,6 +984,11 @@ version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { + name = "System.Security.Principal"; + version = "4.3.0"; + sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; + }) (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.3.0"; @@ -999,31 +999,11 @@ version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; - version = "4.7.0"; - sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; - }) (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { - name = "System.Security.Principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; - }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) (fetchNuGet { name = "System.Text.Encoding"; version = "4.0.11"; @@ -1034,6 +1014,16 @@ version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + }) + (fetchNuGet { + name = "System.Text.Encoding.Extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + }) (fetchNuGet { name = "System.Text.RegularExpressions"; version = "4.1.0"; @@ -1044,21 +1034,21 @@ version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { + name = "System.Threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + }) + (fetchNuGet { + name = "System.Threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + }) (fetchNuGet { name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; - }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) (fetchNuGet { name = "System.Threading.Tasks"; version = "4.0.11"; @@ -1069,6 +1059,16 @@ version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + }) (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; @@ -1084,16 +1084,6 @@ version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) - (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; - }) - (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; @@ -1114,14 +1104,14 @@ version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; - version = "4.3.0"; - sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; - }) (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { + name = "System.Xml.XPath.XmlDocument"; + version = "4.3.0"; + sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; + }) ] From 33042340a70b8b0aa8a01dfd83798c285d99d013 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 15 Apr 2021 18:22:49 +0200 Subject: [PATCH 13/57] haskellPackages.essence-of-live-coding-warp: fix eval and build No idea why essence-of-live-coding-warp constrains on >= 0.2.5, but if it breaks something jailbreaking this then it's on them for not following PVP, I guess. --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c228527d0cc3..4338d58a69a0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1563,9 +1563,9 @@ self: super: { ); # 2020-12-05: http-client is fixed on too old version - essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_6; - }; + essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { + http-client = self.http-client_0_7_7; + }); # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; From ebf3d444cbad5a31a5b772fd50928c994ef27e25 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 15 Apr 2021 09:04:59 +0300 Subject: [PATCH 14/57] mailspring: 1.8.0 -> 1.9.0 - Remove now unneeded override for gtk3. - Add pre and post hooks for explicit phases. - Add doronbehar as maintainer. - Update license, see: https://community.getmailspring.com/t/a-free-open-source-future-for-mailspring/484 --- .../mailreaders/mailspring/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index f0f3bdb3ff46..9389b7576c3e 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "BtzYcHN87qH7s3GiBrsDfmuy9v2xdhCeSShu8+T9T3E="; + sha256 = "ISwNFR8M377+J7WoG9MlblF8r5yRTgCxEGszZCjqW/k="; }; nativeBuildInputs = [ @@ -34,9 +34,7 @@ stdenv.mkDerivation rec { alsaLib db glib - # We don't know why with trackerSupport the executable fail to launch, See: - # https://github.com/NixOS/nixpkgs/issues/106732 - (gtk3.override {trackerSupport = false; }) + gtk3 libkrb5 libsecret nss @@ -52,10 +50,16 @@ stdenv.mkDerivation rec { ]; unpackPhase = '' + runHook preUnpack + dpkg -x $src . + + runHook postUnpack ''; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} cp -ar ./usr/share $out @@ -64,11 +68,13 @@ stdenv.mkDerivation rec { ln -s $out/share/mailspring/mailspring $out/bin/mailspring ln -s ${openssl.out}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 + + runHook postInstall ''; postFixup = /* sh */ '' - substituteInPlace $out/share/applications/mailspring.desktop \ - --replace /usr/bin $out/bin + substituteInPlace $out/share/applications/Mailspring.desktop \ + --replace Exec=mailspring Exec=$out/bin/mailspring ''; meta = with lib; { @@ -77,8 +83,8 @@ stdenv.mkDerivation rec { Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. Mailspring's sync engine runs locally, but its source is not open. ''; - license = licenses.unfree; - maintainers = with maintainers; [ toschmidt ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ toschmidt doronbehar ]; homepage = "https://getmailspring.com"; downloadPage = "https://github.com/Foundry376/Mailspring"; platforms = platforms.x86_64; From 33ffc32fb4f86c844c70304f1164dacdec8971d1 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Thu, 15 Apr 2021 12:49:33 +0800 Subject: [PATCH 15/57] neocomp: 2019-03-12 -> unstable-2021-04-06 --- .../window-managers/neocomp/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index bf017ae085a6..e878f4f088e8 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -16,27 +16,30 @@ , libXinerama , libXrandr , libXrender +, libXres , pcre , pkg-config }: -let - rev = "v0.6-17-g271e784"; -in + stdenv.mkDerivation rec { - pname = "neocomp-unstable"; - version = "2019-03-12"; + pname = "neocomp"; + version = "unstable-2021-04-06"; src = fetchFromGitHub { - inherit rev; - owner = "DelusionalLogic"; - repo = "NeoComp"; - sha256 = "1mp338vz1jm5pwf7pi5azx4hzykmvpkwzx1kw6a9anj272f32zpg"; + owner = "DelusionalLogic"; + repo = "NeoComp"; + rev = "ccd340d7b2dcd3f828aff958a638cc23686aee6f"; + sha256 = "sha256-tLLEwpAGNVTC+N41bM7pfskIli4Yvc95wH2/NT0OZ+8="; }; - buildInputs = [ + nativeBuildInputs = [ asciidoc docbook_xml_dtd_45 docbook_xsl + pkg-config + ]; + + buildInputs = [ freetype judy libGL @@ -50,15 +53,15 @@ stdenv.mkDerivation rec { libXinerama libXrandr libXrender + libXres pcre - pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" "CFGDIR=${placeholder "out"}/etc/xdg/neocomp" "ASTDIR=${placeholder "out"}/share/neocomp/assets" - "COMPTON_VERSION=git-${rev}-${version}" + "COMPTON_VERSION=${version}" ]; postPatch = '' @@ -72,8 +75,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/DelusionalLogic/NeoComp"; - license = licenses.gpl3; - maintainers = with maintainers; [ twey ]; + license = licenses.gpl3Only; + maintainers = with maintainers; [ twey fortuneteller2k ]; platforms = platforms.linux; description = "A fork of Compton, a compositor for X11"; longDescription = '' From 6a71d0b6bf9344b92c9db60643bd17605d23ef56 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:49:02 -0300 Subject: [PATCH 16/57] guile-cairo: rewrite --- .../guile-modules/guile-cairo/default.nix | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 15e3ccbb9722..1ea76cb237df 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -1,23 +1,38 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }: +{ lib +, stdenv +, fetchurl +, cairo +, expat +, guile +, guile-lib +, pkg-config +}: stdenv.mkDerivation rec { pname = "guile-cairo"; version = "1.11.2"; src = fetchurl { - url = "mirror://savannah/guile-cairo/${pname}-${version}.tar.gz"; - sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-YjLU3Cxb2dMxE5s7AfQ0PD4fucp4mDYaaZIGcwlBoHs="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + cairo + expat + guile + ]; - buildInputs = [ guile cairo expat ]; enableParallelBuilding = true; doCheck = false; # Cannot find unit-test module from guile-lib checkInputs = [ guile-lib ]; meta = with lib; { + homepage = "https://www.nongnu.org/guile-cairo/"; description = "Cairo bindings for GNU Guile"; longDescription = '' Guile-Cairo wraps the Cairo graphics library for Guile Scheme. @@ -28,7 +43,6 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = "https://www.nongnu.org/guile-cairo/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 9d8fa10f60e49b07d28bb85cd56cb7783c66f9b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:50:41 -0300 Subject: [PATCH 17/57] guile-fibers: rewrite --- .../guile-modules/guile-fibers/default.nix | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index 3521853187c4..ccc51a5a7691 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -1,26 +1,37 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, guile +, pkg-config +, texinfo +}: -let +stdenv.mkDerivation rec { + pname = "guile-fibers"; version = "1.0.0"; - name = "guile-fibers-${version}"; -in stdenv.mkDerivation { - inherit name; src = fetchFromGitHub { owner = "wingo"; repo = "fibers"; rev = "v${version}"; - sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi"; + hash = "sha256-kU/ty/XRNfv3ubIwH40wZmo8MXApeduHcH2KEGqoh+Q="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ guile texinfo ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; autoreconfPhase = "./autogen.sh"; meta = with lib; { - description = "Concurrent ML-like concurrency for Guile"; homepage = "https://github.com/wingo/fibers"; + description = "Concurrent ML-like concurrency for Guile"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 03ba2b5039abfe90d22ae00059726ca257d3bbae Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:56:58 -0300 Subject: [PATCH 18/57] guile-gnome: rewrite --- .../guile-modules/guile-gnome/default.nix | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 2dc07deac5c6..ead08ce0231b 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,7 +1,21 @@ -{ fetchurl, lib, stdenv, guile, guile-lib, gwrap -, pkg-config, gconf, glib, gnome_vfs, gtk2 -, libglade, libgnome, libgnomecanvas, libgnomeui -, pango, guile-cairo, texinfo +{ lib +, stdenv +, fetchurl +, gconf +, glib +, gnome_vfs +, gtk2 +, guile +, guile-cairo +, guile-lib +, gwrap +, libglade +, libgnome +, libgnomecanvas +, libgnomeui +, pango +, pkg-config +, texinfo }: stdenv.mkDerivation rec { @@ -10,20 +24,37 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/guile-gnome/${pname}/${pname}-${version}.tar.gz"; - sha256 = "adabd48ed5993d8528fd604e0aa0d96ad81a61d06da6cdd68323572ad6c216c3"; + hash = "sha256-ravUjtWZPYUo/WBOCqDZatgaYdBtps3WgyNXKtbCFsM="; }; + nativeBuildInputs = [ + pkg-config + texinfo + ]; buildInputs = [ - texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2 - libglade libgnome libgnomecanvas libgnomeui pango guile-cairo + gconf + glib + gnome_vfs + gtk2 + guile + guile-cairo + gwrap + libglade + libgnome + libgnomecanvas + libgnomeui + pango ] ++ lib.optional doCheck guile-lib; # The test suite tries to open an X display, which fails. doCheck = false; - GUILE_AUTO_COMPILE = 0; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; meta = with lib; { + homepage = "https://www.gnu.org/software/guile-gnome/"; description = "GNOME bindings for GNU Guile"; longDescription = '' GNU guile-gnome brings the power of Scheme to your graphical application. @@ -32,7 +63,6 @@ stdenv.mkDerivation rec { guile-gnome a comprehensive environment for developing modern applications. ''; - homepage = "https://www.gnu.org/software/guile-gnome/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 08b221fa0d2e3c1241ada2ca3672abd0c469de07 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:57:17 -0300 Subject: [PATCH 19/57] guile-lib: rewrite --- .../guile-modules/guile-lib/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 34299b345eeb..50c6a1daefb2 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,20 +1,29 @@ -{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }: +{ lib +, stdenv +, fetchurl +, guile +, pkg-config +, texinfo +}: assert stdenv ? cc && stdenv.cc.isGNU; -let - name = "guile-lib-${version}"; +stdenv.mkDerivation rec { + pname = "guile-lib"; version = "0.2.6.1"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://savannah/guile-lib/${name}.tar.gz"; - sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-bR09DxTbnSgLjUJ9bh3sRBfd0Cv/I71Zguy24mLrPyo="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ guile texinfo ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; doCheck = true; @@ -25,6 +34,7 @@ in stdenv.mkDerivation { ''; meta = with lib; { + homepage = "https://www.nongnu.org/guile-lib/"; description = "A collection of useful Guile Scheme modules"; longDescription = '' guile-lib is intended as an accumulation place for pure-scheme Guile @@ -32,7 +42,6 @@ in stdenv.mkDerivation { modules into a coherent library. Think "a down-scaled, limited-scope CPAN for Guile". ''; - homepage = "https://www.nongnu.org/guile-lib/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.gnu ++ platforms.linux; From 08694d24f119432709099a7cd93097906303072d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:57:47 -0300 Subject: [PATCH 20/57] guile-ncurses: rewrite --- .../guile-modules/guile-ncurses/default.nix | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index 8f879249a23e..1e6418b0c3c7 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }: +{ lib +, stdenv +, fetchurl +, pkg-config +, guile +, libffi +, ncurses +}: -let - name = "guile-ncurses-${version}"; +stdenv.mkDerivation rec { + pname = "guile-ncurses"; version = "1.7"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://gnu/guile-ncurses/${name}.tar.gz"; - sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-JZPNoQuIl5XayUpm0RdWNg8TT2LZGDOuFoae9crZe5Q="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ guile ncurses libffi ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + guile + libffi + ncurses + ]; preConfigure = '' configureFlags="$configureFlags --with-guilesitedir=$out/share/guile/site" @@ -29,6 +40,7 @@ in stdenv.mkDerivation { doCheck = false; meta = with lib; { + homepage = "https://www.gnu.org/software/guile-ncurses/"; description = "Scheme interface to the NCurses libraries"; longDescription = '' GNU Guile-Ncurses is a library for the Guile Scheme interpreter that @@ -36,7 +48,6 @@ in stdenv.mkDerivation { interface functionality is built on the ncurses libraries: curses, form, panel, and menu. ''; - homepage = "https://www.gnu.org/software/guile-ncurses/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.gnu ++ platforms.linux; From 210d5c7d003e43d1f962d78acfba64de13adea70 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:58:14 -0300 Subject: [PATCH 21/57] guile-opengl: rewrite --- .../guile-modules/guile-opengl/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index 5ada5d41c7d9..437af0f4edf2 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -1,21 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, guile }: +{ lib +, stdenv +, fetchurl +, guile +, pkg-config +}: -let - name = "guile-opengl-${version}"; +stdenv.mkDerivation rec { + pname = "guile-opengl"; version = "0.1.0"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://gnu/guile-opengl/${name}.tar.gz"; - sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-NdK5UwUszX5B0kKbynG8oD2PCKIGpZ1x91ktBDvpDo8="; }; - nativeBuildInputs = [ pkg-config guile ]; + nativeBuildInputs = [ + pkg-config + guile + ]; meta = with lib; { - description = "Guile bindings for the OpenGL graphics API"; homepage = "https://www.gnu.org/software/guile-opengl/"; + description = "Guile bindings for the OpenGL graphics API"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.unix; From 397fc14c1e57974b553df05a31305f04a75f86df Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:59:15 -0300 Subject: [PATCH 22/57] guile-reader: rewrite --- .../guile-modules/guile-reader/default.nix | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index eaf402a86058..1675ac0e333a 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -1,36 +1,49 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config -, gperf, guile, guile-lib, libffi }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, gperf +, guile +, guile-lib +, libffi +, pkg-config +}: stdenv.mkDerivation rec { - pname = "guile-reader"; version = "0.6.3"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/guile-reader/${pname}-${version}.tar.gz"; - sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; + url = "http://download.savannah.nongnu.org/releases/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gperf guile guile-lib libffi ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + gperf + guile + guile-lib + libffi + ]; GUILE_SITE="${guile-lib}/share/guile/site"; configureFlags = [ "--with-guilemoduledir=$(out)/share/guile/site" ]; meta = with lib; { + homepage = "https://www.nongnu.org/guile-reader/"; description = "A simple framework for building readers for GNU Guile"; longDescription = '' - Guile-Reader is a simple framework for building readers for GNU - Guile. + Guile-Reader is a simple framework for building readers for GNU Guile. - The idea is to make it easy to build procedures that extend - Guile's read procedure. Readers supporting various syntax - variants can easily be written, possibly by re-using existing - "token readers" of a standard Scheme readers. For example, it - is used to implement Skribilo's R5RS-derived document syntax. + The idea is to make it easy to build procedures that extend Guile's read + procedure. Readers supporting various syntax variants can easily be + written, possibly by re-using existing "token readers" of a standard + Scheme readers. For example, it is used to implement Skribilo's + R5RS-derived document syntax. ''; - homepage = "https://www.nongnu.org/guile-reader/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.gnu; From 60fcd0705f2349dc9a074be243ea5b638c9eb9bd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:59:41 -0300 Subject: [PATCH 23/57] guile-sdl: rewrite --- .../guile-modules/guile-sdl/default.nix | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index 8816e7b4ffcb..c6e250e6d717 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv -, SDL, SDL_image, SDL_ttf, SDL_mixer +{ lib +, stdenv +, fetchurl +, SDL +, SDL_image +, SDL_mixer +, SDL_ttf +, buildEnv +, guile +, pkg-config }: stdenv.mkDerivation rec { @@ -8,25 +16,33 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01"; + hash = "sha256-ATx1bnnDlj69h6ZUy7wd2lVsuDGS424sFCIlJQLQTzI="; }; - nativeBuildInputs = [ pkg-config guile ]; - - buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ]; - - GUILE_AUTO_COMPILE = 0; + nativeBuildInputs = [ + guile + pkg-config + ]; + buildInputs = [ + SDL.dev + SDL_image + SDL_mixer + SDL_ttf + ]; makeFlags = let - sdl = buildEnv { + sdl-env = buildEnv { name = "sdl-env"; paths = buildInputs; }; - in [ "SDLMINUSI=-I${sdl}/include/SDL" ]; + in [ + "GUILE_AUTO_COMPILE=0" + "SDLMINUSI=-I${sdl-env}/include/SDL" + ]; meta = with lib; { - description = "Guile bindings for SDL"; homepage = "https://www.gnu.org/software/guile-sdl/"; + description = "Guile bindings for SDL"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 120f478e422ea261490f898222ecd04d71524b05 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 11:59:56 -0300 Subject: [PATCH 24/57] guile-sdl2: rewrite --- .../guile-modules/guile-sdl2/default.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index c3f5fdaefbd2..c6fbba93de47 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -1,36 +1,50 @@ -{ lib, stdenv, fetchurl, guile, libtool, pkg-config -, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer +{ lib +, stdenv +, fetchurl +, SDL2 +, SDL2_image +, SDL2_mixer +, SDL2_ttf +, guile +, libtool +, pkg-config }: -let - name = "${pname}-${version}"; +stdenv.mkDerivation rec { pname = "guile-sdl2"; version = "0.5.0"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "https://files.dthompson.us/${pname}/${name}.tar.gz"; - sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m"; + url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-lWTLctPUDqvN/Y95oOL7LF3czlLJFQ9d9np9dx4DHYU="; }; - nativeBuildInputs = [ libtool pkg-config ]; + nativeBuildInputs = [ + pkg-config + libtool + ]; buildInputs = [ - guile SDL2 SDL2_image SDL2_ttf SDL2_mixer + SDL2 + SDL2_image + SDL2_mixer + SDL2_ttf + guile ]; configureFlags = [ - "--with-libsdl2-prefix=${SDL2}" "--with-libsdl2-image-prefix=${SDL2_image}" - "--with-libsdl2-ttf-prefix=${SDL2_ttf}" "--with-libsdl2-mixer-prefix=${SDL2_mixer}" + "--with-libsdl2-prefix=${SDL2}" + "--with-libsdl2-ttf-prefix=${SDL2_ttf}" ]; - makeFlags = [ "GUILE_AUTO_COMPILE=0" ]; + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; meta = with lib; { - description = "Bindings to SDL2 for GNU Guile"; homepage = "https://dthompson.us/projects/guile-sdl2.html"; + description = "Bindings to SDL2 for GNU Guile"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ seppeljordan vyp ]; platforms = platforms.all; From 1da34ac3c4cddc60fc72773ed9f048c3464b80a4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 12:06:35 -0300 Subject: [PATCH 25/57] guile-xcb: rewrite --- .../guile-modules/guile-xcb/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index 2de445244259..72066313ecaa 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -1,29 +1,36 @@ -{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }: +{ lib +, stdenv +, fetchurl +, guile +, pkg-config +, texinfo +}: -let - name = "guile-xcb-${version}"; +stdenv.mkDerivation rec { + pname = "guile-xcb"; version = "1.3"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "http://www.markwitmer.com/dist/${name}.tar.gz"; - sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149"; + url = "http://www.markwitmer.com/dist/${pname}-${version}.tar.gz"; + hash = "sha256-iYR6AYSTgUsURAEJTWcdHlc0f8LzEftAIsfonBteuxE="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ guile texinfo ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + guile + texinfo + ]; - preConfigure = '' - configureFlags=" - --with-guile-site-dir=$out/share/guile/site - --with-guile-site-ccache-dir=$out/share/guile/site - "; - ''; + configureFlags = [ + "--with-guile-site-dir=$out/share/guile/site" + "--with-guile-site-ccache-dir=$out/share/guile/site" + ]; meta = with lib; { - description = "XCB bindings for Guile"; homepage = "http://www.markwitmer.com/guile-xcb/guile-xcb.html"; + description = "XCB bindings for Guile"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; From 449365497b3f26863c1cc7c210e057e259f89eaa Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 10:32:48 -0300 Subject: [PATCH 26/57] Reorder guile.* expressions in top-level/all-packages.nix This commit groups together the guile.* calls together. --- pkgs/top-level/all-packages.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab2ef5d68f49..1b58eb7378b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11650,15 +11650,6 @@ in groovy = callPackage ../development/interpreters/groovy { }; - guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; - - # Needed for autogen - guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; - - guile_2_2 = callPackage ../development/interpreters/guile { }; - - guile = guile_2_2; - inherit (callPackages ../applications/networking/cluster/hadoop { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }) @@ -12080,6 +12071,15 @@ in gImageReader = callPackage ../applications/misc/gImageReader { }; + guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { }; + + # Needed for autogen + guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { }; + + guile_2_2 = callPackage ../development/interpreters/guile { }; + + guile = guile_2_2; + guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; From 5e3b5d5b672e947477f5fe5c8c81430bcf0f38b1 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 10:30:13 -0300 Subject: [PATCH 27/57] guile-commonmark: init at 0.1.2 --- .../guile-commonmark/default.nix | 42 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/guile-modules/guile-commonmark/default.nix diff --git a/pkgs/development/guile-modules/guile-commonmark/default.nix b/pkgs/development/guile-modules/guile-commonmark/default.nix new file mode 100644 index 000000000000..113fad13600c --- /dev/null +++ b/pkgs/development/guile-modules/guile-commonmark/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, guile +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "guile-commonmark"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "OrangeShark"; + repo = pname; + rev = "v${version}"; + hash = "sha256-qYDcIiObKOU8lmcfk327LMPx/2Px9ecI3QLrSWWLxMo="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ + guile + ]; + + # https://github.com/OrangeShark/guile-commonmark/issues/20 + doCheck = false; + + makeFlags = [ + "GUILE_AUTO_COMPILE=0" + ]; + + meta = with lib; { + homepage = "https://github.com/OrangeShark/guile-commonmark"; + description = "Implementation of CommonMark for Guile"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1b58eb7378b4..f52218b476bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12082,6 +12082,8 @@ in guile-cairo = callPackage ../development/guile-modules/guile-cairo { }; + guile-commonmark = callPackage ../development/guile-modules/guile-commonmark { }; + guile-fibers = callPackage ../development/guile-modules/guile-fibers { }; guile-gnome = callPackage ../development/guile-modules/guile-gnome { From e3733c89ed725a7131626c5854fe4a9a74a2f53d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 15 Apr 2021 01:12:38 -0300 Subject: [PATCH 28/57] haunt: init at 0.2.4 --- pkgs/applications/misc/haunt/default.nix | 59 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/applications/misc/haunt/default.nix diff --git a/pkgs/applications/misc/haunt/default.nix b/pkgs/applications/misc/haunt/default.nix new file mode 100644 index 000000000000..124e441a5af2 --- /dev/null +++ b/pkgs/applications/misc/haunt/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, guile +, guile-commonmark +, guile-reader +, makeWrapper +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "haunt"; + version = "0.2.4"; + + src = fetchurl { + url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; + hash = "sha256-zOkICg7KmJJhPWPtJRT3C9sYB1Oig1xLtgPNGe0n3xQ="; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + buildInputs = [ + guile + guile-commonmark + guile-reader + ]; + + postInstall = '' + wrapProgram $out/bin/haunt \ + --prefix GUILE_LOAD_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" \ + --prefix GUILE_LOAD_COMPILED_PATH : "$out/share/guile/site:${guile-commonmark}/share/guile/site:${guile-reader}/share/guile/site" + ''; + + meta = with lib; { + homepage = "https://dthompson.us/projects/haunt.html"; + description = "Guile-based static site generator"; + longDescription = '' + Haunt is a simple, functional, hackable static site generator that gives + authors the ability to treat websites as Scheme programs. + + By giving authors the full expressive power of Scheme, they are able to + control every aspect of the site generation process. Haunt provides a + simple, functional build system that can be easily extended for this + purpose. + + Haunt has no opinion about what markup language authors should use to + write posts, though it comes with support for the popular Markdown + format. Likewise, Haunt has no opinion about how authors structure their + sites. Though it comes with support for building simple blogs or Atom + feeds, authors should feel empowered to tweak, replace, or create builders + to do things that aren't provided out-of-the-box. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = guile.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f52218b476bd..e502023e125b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23506,6 +23506,8 @@ in wxGTK = wxGTK30; }; + haunt = callPackage ../applications/misc/haunt { }; + hugo = callPackage ../applications/misc/hugo { }; go-org = callPackage ../applications/misc/go-org { }; From 94cb97abee9735446844c247622f4a3695b78a8a Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Mon, 12 Apr 2021 20:14:23 +0200 Subject: [PATCH 29/57] agi: init at 1.1.0-dev-20210413 --- pkgs/tools/graphics/agi/default.nix | 69 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/tools/graphics/agi/default.nix diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix new file mode 100644 index 000000000000..3fe6698846e5 --- /dev/null +++ b/pkgs/tools/graphics/agi/default.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, wrapGAppsHook +, gobject-introspection +, gdk-pixbuf +, jre +, androidenv +}: + +stdenv.mkDerivation rec { + pname = "agi"; + version = "1.1.0-dev-20210413"; + + src = fetchzip { + url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; + sha256 = "13i6n95d0cjrhx68qsich6xzk5f9ga0y3m19k4z2d58s164rnh0v"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + wrapGAppsHook + gdk-pixbuf + gobject-introspection + copyDesktopItems + ]; + + buildInputs = [ + stdenv.cc.cc.lib + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} + cp ./{agi,gapis,gapir,gapit,device-info} $out/bin + cp lib/gapic.jar $out/lib + wrapProgram $out/bin/agi \ + --add-flags "--vm ${jre}/bin/java" \ + --add-flags "--jar $out/lib/gapic.jar" \ + --add-flags "--adb ${androidenv.androidPkgs_9_0.platform-tools}/bin/adb" + for i in 16 32 48 64 96 128 256 512 1024; do + install -D ${src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png + done + runHook postInstall + ''; + + desktopItems = [(makeDesktopItem { + name = "agi"; + desktopName = "Android GPU Inspector"; + exec = "$out/bin/agi"; + icon = "agi"; + type = "Application"; + categories = "Development;Debugger;Graphics;3DGraphics"; + terminal = "false"; + })]; + + meta = with lib; { + homepage = "https://github.com/google/agi/"; + description = "Android GPU Inspector"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29e801eb11d9..cffb67060db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -749,6 +749,8 @@ in agda-pkg = callPackage ../development/tools/agda-pkg { }; + agi = callPackage ../tools/graphics/agi { }; + agrep = callPackage ../tools/text/agrep { }; aha = callPackage ../tools/text/aha { }; From e91e8bcdf28dab8d8496079fb4486d3508ac6555 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Apr 2021 21:38:28 +0000 Subject: [PATCH 30/57] electron_12: 12.0.2 -> 12.0.4 https://github.com/electron/electron/releases/tag/v12.0.3 https://github.com/electron/electron/releases/tag/v12.0.4 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 518eef2d1a0d..9ebb8ef7b434 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -104,12 +104,12 @@ rec { headers = "1bpsmmlxl4gk9yn5w7f8m6g8k1gmvwk0jwpqlk5islpkcy6x7107"; }; - electron_12 = mkElectron "12.0.2" { - x86_64-linux = "fc3ff888d8cd4ada8368420c8951ed1b5ad78919bdcb688abe698d00e12a2e0a"; - x86_64-darwin = "766ca8f8adc4535db3069665ea8983979ea79dd5ec376e1c298f858b420ec58f"; - i686-linux = "78ab55db275b85210c6cc14ddf41607fbd5cefed93ef4d1b6b74630b0841b23c"; - armv7l-linux = "8be8c6ea05da669d79179c5969ddee853710a1dd44f86e8f3bbe1167a2daf13c"; - aarch64-linux = "9ef70ab9347be63555784cac99efbaff1ef2d02dcc79070d7bccd18c38de87ef"; - headers = "07095b5rylilbmyd0syamm6fc4pngazldj5jgm7blgirdi8yzzd2"; + electron_12 = mkElectron "12.0.4" { + x86_64-linux = "6419716f614f396954981e6432afe77277dff2b64ecb84e2bbd6d740362ea01c"; + x86_64-darwin = "3072f1854eb5b91d5f24e03a313583bb85d696cda48381bdf3e40ee2c93dfe34"; + i686-linux = "fa241874aacca8fe4b4f940fa9133fe65fdcf9ef0847322332f0c67ee7b42aa0"; + armv7l-linux = "8d88d13bf117820bc3b46501d34004f18ebf402f2817836a2a7ba4fc60433653"; + aarch64-linux = "c5cbcbb5b397407e45e682480b30da4fcf94154ac92d8f6eea4c79a50d56626a"; + headers = "121falvhz0bfxc2h7wwvyfqdagr3aznida4f4phzqp0ja3rznxf3"; }; } From af8be16988bf687b567961e94da0a47cec481e02 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Apr 2021 21:40:40 +0000 Subject: [PATCH 31/57] electron_11: 11.4.1 -> 11.4.3 https://github.com/electron/electron/releases/tag/v11.4.2 https://github.com/electron/electron/releases/tag/v11.4.3 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9ebb8ef7b434..9ffa2be33534 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -95,13 +95,13 @@ rec { headers = "13cpkblkvhvd3sww8n1gw4rhva84x2fkkg81yr3n2mb0virlfgpn"; }; - electron_11 = mkElectron "11.4.1" { - x86_64-linux = "3efd3d3b5a9f71323320288aece65fcec89ea0331c3d6d3afc2495d3b0dc95d3"; - x86_64-darwin = "6ff91613c51b2ebaf280eb86b826f47d62639081a0f38c2012c428a17619a163"; - i686-linux = "513e1bc7a3e546dc0e712836886ac89c9f76bb7fb1e4b7a1f9d9cbc7347d8569"; - armv7l-linux = "838fc96d90cfcc5e1e892287008f9d9d2dbe27f3d4cf2479e6275ecdd140fb65"; - aarch64-linux = "a3de4208b5033a19ffa9dd8130d440909b181c0ef57cb51c8f9c8dbbb1267a26"; - headers = "1bpsmmlxl4gk9yn5w7f8m6g8k1gmvwk0jwpqlk5islpkcy6x7107"; + electron_11 = mkElectron "11.4.3" { + x86_64-linux = "222e7aa51d5516796d532f784c574f07315bad4bf29efb0ce687014f93ba5fa5"; + x86_64-darwin = "6cccbaf8dca7eb3819b0ac3044686f6705c5d51c88ee1361d8573c2b83c8dc0a"; + i686-linux = "1910729fd6088e9c914db9fdd6c42ce6747fcb048947dd83fa2cdf564c786353"; + armv7l-linux = "e0e1375bdb79a6917467490683e49bb59da9260b73d7b710a5e4e4535c1c5e80"; + aarch64-linux = "9fb287ed8bcc7782775bd615fe1c31db4a8b6d548209fd15ef5312ac72a04d07"; + headers = "00gln9jlb621gvxx1z7s212wakjbdigdqv02vx1pjvkg62aazg8j"; }; electron_12 = mkElectron "12.0.4" { From 55853a8e9c6f32fc3f7d1a4ea2902dc7b8f63708 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 15 Apr 2021 21:42:10 +0000 Subject: [PATCH 32/57] electron_10: 10.4.2 -> 10.4.3 https://github.com/electron/electron/releases/tag/v10.4.3 --- pkgs/development/tools/electron/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 9ffa2be33534..ddd51f268e27 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -86,13 +86,13 @@ rec { headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885"; }; - electron_10 = mkElectron "10.4.2" { - x86_64-linux = "3d613b413f01c8af1600be42c82941761452407e1160125eca60feec0d7dd0c0"; - x86_64-darwin = "87b18811d165f2fd64606ae13a567b737f54bd41c7e2204a047a3532f4fa2d9c"; - i686-linux = "297083ca9b21554ea1f729ed17c0c8b13aaea24e77194f9c1b340489fcfc0fa6"; - armv7l-linux = "3d93ec220824cce5d99b3a7511604b89c63935bd1130fc64ce08b8436e34c096"; - aarch64-linux = "0060e37eada91bac51945ae325ab04309438609089d31ab3f8bbfda73cc26166"; - headers = "13cpkblkvhvd3sww8n1gw4rhva84x2fkkg81yr3n2mb0virlfgpn"; + electron_10 = mkElectron "10.4.3" { + x86_64-linux = "48793fc6c6d3bfb8df81cd29f6c52e68c8c6b901693c6ba4ed505799fa673e9f"; + x86_64-darwin = "28cbacf51e0528e0d4ba30a2c56efd6a8e7f836104786733aae0c5fc99dc2615"; + i686-linux = "b9b7fd9b91630350dafe97a31c918f941ab15b044f0b4e9b2a705482447fe78f"; + armv7l-linux = "b1e1b4d0620eae647915c95d21656d21c00efe89f44198938d9fd9fba045e39c"; + aarch64-linux = "aa9177becf787920cef4cde27a6ed08e2e23976678162a3cd6b77615b1582c05"; + headers = "0phv08myxq226blrqzg3fza3mh3ivgfmcja98b7377pc3x7bv76g"; }; electron_11 = mkElectron "11.4.3" { From f16b70941f3ea6215056387036cce02a8d9b6b29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Apr 2021 16:25:42 +0200 Subject: [PATCH 33/57] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/3970dc533574340f58270c6685cbb38caab8d0e1. --- .../haskell-modules/hackage-packages.nix | 488 ++++++++++++++++-- 1 file changed, 440 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ced1d5e40a5e..e5132fd5fbd7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -50565,8 +50565,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.1"; - sha256 = "1zbxwz8qg7yqvl70x2bcd0nib6akd6ii6fa2mrrg1nd255q6cyjb"; + version = "0.1.28.2"; + sha256 = "0hy29d34w06n7pyjycp7n3f4l6717n2z9yzjq39df05bf8xnigkj"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -72766,6 +72766,29 @@ self: { broken = true; }) {}; + "deepl" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, foldl, lens + , lens-aeson, protolude, resourcet, streaming, streaming-bytestring + , wreq + }: + mkDerivation { + pname = "deepl"; + version = "0.1.0.0"; + sha256 = "1wckhfq5g5aqzh2ybw4bbq39hn1yc1yzb8akd5vvhcip8afkkqsa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cmdargs foldl lens lens-aeson protolude + resourcet streaming streaming-bytestring wreq + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs foldl lens lens-aeson protolude + resourcet streaming streaming-bytestring wreq + ]; + description = "Call DeepL to translate you files"; + license = lib.licenses.bsd3; + }) {}; + "deeplearning-hs" = callPackage ({ mkDerivation, accelerate, base, mtl, QuickCheck, repa , repa-algorithms, test-framework, test-framework-quickcheck2 @@ -73482,8 +73505,8 @@ self: { }: mkDerivation { pname = "dependent-monoidal-map"; - version = "0.1.1.1"; - sha256 = "0i3zgngcdli6hw09h985ca4n7l9cpsrxalbhg8lbq32hwh7dim89"; + version = "0.1.1.2"; + sha256 = "11qcrxji3lvq4blzh1qk9wkhhzjkvz3maxfv63zgby98dpmkxa2x"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum dependent-sum-aeson-orphans @@ -73538,8 +73561,8 @@ self: { }: mkDerivation { pname = "dependent-sum-aeson-orphans"; - version = "0.3.0.0"; - sha256 = "1wpjrynv9zva3hw1wgmqd5pmhhpa491yh85p1dnbpkj7h0g1pl1a"; + version = "0.3.1.0"; + sha256 = "1psjd7va8k53vq9kh4pclsf27798mc1ggk1csjk39c8d97vm41qz"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map dependent-sum some @@ -80844,8 +80867,8 @@ self: { }: mkDerivation { pname = "duckling"; - version = "0.1.6.1"; - sha256 = "0lvvp13f5zcnf3cnl40avnfh3mgj304d5qfw08mbnwqz1bqp94xy"; + version = "0.2.0.0"; + sha256 = "0hr3dwfksi04is2wqykfx04da40sa85147fnfnmazw5czd20xwya"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80862,8 +80885,7 @@ self: { aeson base tasty tasty-hunit text time unordered-containers ]; description = "A Haskell library for parsing text into structured data"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; + license = lib.licenses.bsd3; }) {}; "duet" = callPackage @@ -98251,6 +98273,8 @@ self: { pname = "futhark"; version = "0.19.4"; sha256 = "1d4704pmknv39yw2bjxkp5n2wl9a14n3pn221m3src5z237lchq7"; + revision = "1"; + editedCabalFile = "1d8vwgdvj1dib7l4a3lhn03ri2mbnm57wnd3pki6m7y8sr3xk730"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98466,8 +98490,8 @@ self: { }: mkDerivation { pname = "fuzzyfind"; - version = "2.2.0"; - sha256 = "0rb96cd0lfk41gc5xc52adibjpi16xs82kifsymqykrpsgrgj525"; + version = "3.0.0"; + sha256 = "0vkjqgsa0qv8sz4bwwi49zf17fl23vckwvmr1agsd20rbhw4ivyr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers massiv text ]; @@ -139066,6 +139090,22 @@ self: { license = lib.licenses.mit; }) {}; + "hspec_2_7_10" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.7.10"; + sha256 = "0z0lwrmrqkglr78n6k2c36n4h68142bh785ys0x4jaibjshvs6rw"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -139148,6 +139188,34 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-core_2_7_10" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.7.10"; + sha256 = "12k9yp5gznrda449ir60d5wv3xl7nnyffkb5mhfc0svw9f8lxlv1"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -139185,6 +139253,26 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-discover_2_7_10" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.7.10"; + sha256 = "13yzvd3b679skvs1insk4s0wc4zvmz6hs38kc8q0j6vzqq06smqa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -142617,6 +142705,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "http2_3_0_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, async, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filepath, gauge, Glob, heaps, hspec + , hspec-discover, http-types, mwc-random, network + , network-byte-order, network-run, psqueues, stm, text + , time-manager, typed-process, unix-time, unordered-containers + , vector + }: + mkDerivation { + pname = "http2"; + version = "3.0.0"; + sha256 = "17j4p2apyiiznkwdn9a8pdb43vcwbnpzyff2wqlzpbf9habb8idf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager unix-time + ]; + testHaskellDepends = [ + aeson aeson-pretty async base base16-bytestring bytestring + cryptonite directory filepath Glob hspec http-types + network-byte-order network-run text typed-process + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -157914,6 +158037,17 @@ self: { broken = true; }) {}; + "koji" = callPackage + ({ mkDerivation, base, haxr, mtl }: + mkDerivation { + pname = "koji"; + version = "0.0.1"; + sha256 = "0yxx6xk5xld7jf7ph4x0r7k4bqcg02yl7597awbgbq82x97gyfb8"; + libraryHaskellDepends = [ base haxr mtl ]; + description = "Koji buildsystem XML-RPC API bindings"; + license = lib.licenses.gpl2Only; + }) {}; + "kontra-config" = callPackage ({ mkDerivation, base, bytestring, data-default, exceptions, text , transformers-base, unjson, utf8-string, yaml @@ -175101,8 +175235,8 @@ self: { ({ mkDerivation, base, hspec, hspec-discover, rio, transformers }: mkDerivation { pname = "method"; - version = "0.3.0.0"; - sha256 = "1a5i9sd5zz5kjpjpar3r5ak61x8fz5rrbb1iak1r2dcwlyk6rq25"; + version = "0.3.1.0"; + sha256 = "0a96av07vbh3mvyczh2jiziqb098q81jx6q0c5kgn7pmlxijw1ba"; libraryHaskellDepends = [ base rio transformers ]; testHaskellDepends = [ base hspec rio transformers ]; testToolDepends = [ hspec-discover ]; @@ -188787,8 +188921,8 @@ self: { }: mkDerivation { pname = "nix-thunk"; - version = "0.2.0.3"; - sha256 = "1pcmn31hf81gxmmjyqc23pwpaafx03alvx2fgynd1isdsb0057my"; + version = "0.3.0.0"; + sha256 = "11fn65swyj7b3l7xs6rws81nnccr2hcf81igqmna5bwck3g2gklw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190109,6 +190243,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-env-parser_0_1_0_7" = callPackage + ({ mkDerivation, base, modern-uri, network-uri, nri-prelude, text + }: + mkDerivation { + pname = "nri-env-parser"; + version = "0.1.0.7"; + sha256 = "1mm879mqpgl040p789wcjm5bhrqia5czn18c5dgni8bwa4y61ank"; + libraryHaskellDepends = [ + base modern-uri network-uri nri-prelude text + ]; + description = "Read environment variables as settings to build 12-factor apps"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-observability" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs , bytestring, directory, hostname, http-client, http-client-tls @@ -190133,6 +190282,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-observability_0_1_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs + , bytestring, directory, hostname, http-client, http-client-tls + , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text + , time, unordered-containers + }: + mkDerivation { + pname = "nri-observability"; + version = "0.1.0.2"; + sha256 = "19nil7vyjbvbjlapvrxky8fkxdl3f2xhqdi3a5m5i5lyawm74b6z"; + libraryHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers + ]; + description = "Report log spans collected by nri-prelude"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-prelude" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc @@ -190159,7 +190333,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "nri-prelude_0_5_0_3" = callPackage + "nri-prelude_0_6_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc , hedgehog, junit-xml, pretty-diff, pretty-show, safe-coloured-text @@ -190167,8 +190341,8 @@ self: { }: mkDerivation { pname = "nri-prelude"; - version = "0.5.0.3"; - sha256 = "0k4mhgyazjc74hwf2xgznhhkryqhdmsc2pv1v9d32706qkr796wn"; + version = "0.6.0.0"; + sha256 = "02v83n08zxz8521skijgrn407a0mlkjc3fjn5q04gn932wf29g5s"; libraryHaskellDepends = [ aeson aeson-pretty async auto-update base bytestring containers directory exceptions filepath ghc hedgehog junit-xml pretty-diff @@ -198622,6 +198796,8 @@ self: { pname = "patch"; version = "0.0.3.2"; sha256 = "1b819d1iramxb0sf0zm4ry8mrd74y35iffbb6qys3a2xq1d382xa"; + revision = "2"; + editedCabalFile = "09v23qakrdjscwvzjarkssikkp7xmq9jbpp5hh1y857l02r3fz5c"; libraryHaskellDepends = [ base constraints-extras containers dependent-map dependent-sum lens monoidal-containers semialign semigroupoids these transformers @@ -206444,31 +206620,28 @@ self: { "polysemy-http" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring - , case-insensitive, co-log-core, co-log-polysemy, composition - , containers, data-default, either, hedgehog, http-client - , http-client-tls, http-types, lens, network, polysemy - , polysemy-log, polysemy-plugin, relude, servant, servant-client - , servant-server, string-interpolate, tasty, tasty-hedgehog - , template-haskell, text, time, warp + , case-insensitive, composition, containers, data-default, either + , hedgehog, http-client, http-client-tls, http-types, lens, network + , polysemy, polysemy-log, polysemy-plugin, relude, servant + , servant-client, servant-server, string-interpolate, tasty + , tasty-hedgehog, template-haskell, text, time, warp }: mkDerivation { pname = "polysemy-http"; - version = "0.4.0.2"; - sha256 = "0xxl33iydycw1n2q9wvbx3jlhzsw9yhbm4v0a8v2ic05nqlmaw4l"; + version = "0.4.0.3"; + sha256 = "0sp4s8spf0nzqs8cw9swnsxd2wxa0g4cnz236n7m6z73450ih3c7"; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring case-insensitive co-log-core - co-log-polysemy composition containers data-default either - http-client http-client-tls http-types lens polysemy polysemy-log - polysemy-plugin relude string-interpolate template-haskell text - time + aeson ansi-terminal base bytestring case-insensitive composition + containers data-default either http-client http-client-tls + http-types lens polysemy polysemy-log polysemy-plugin relude + string-interpolate template-haskell text time ]; testHaskellDepends = [ - aeson ansi-terminal base bytestring case-insensitive co-log-core - co-log-polysemy composition containers data-default either hedgehog - http-client http-client-tls http-types lens network polysemy - polysemy-log polysemy-plugin relude servant servant-client - servant-server string-interpolate tasty tasty-hedgehog - template-haskell text time warp + aeson ansi-terminal base bytestring case-insensitive composition + containers data-default either hedgehog http-client http-client-tls + http-types lens network polysemy polysemy-log polysemy-plugin + relude servant servant-client servant-server string-interpolate + tasty tasty-hedgehog template-haskell text time warp ]; description = "Polysemy effect for http-client"; license = "BSD-2-Clause-Patent"; @@ -220582,8 +220755,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.8.0.0"; - sha256 = "14pw033ljs6x5bi5657cm5lpwwj6gkfgskbv5lpdi2hp7svzayql"; + version = "0.8.1.0"; + sha256 = "0p27dj7fckkvw9li69whcfrv1cd59kkp6qbvfmndzx8fbh44ggbp"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -220704,6 +220877,8 @@ self: { pname = "reflex-dom"; version = "0.6.1.0"; sha256 = "190g56y16xvj508qdp3znlbbv4gb3ska38jbjpblvq8cz2d4nkdc"; + revision = "1"; + editedCabalFile = "0xi2bn6d4bgbfqngl2y9gva4nxii65v3hzrik74wzdsf17wyrmv9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220766,8 +220941,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.6.1.0"; - sha256 = "072bkjjmz6mjw42gchlbswhjhr9xs0vaybf6mvdycs618lb1zhf0"; + version = "0.6.2.0"; + sha256 = "067m8ifgkknafy0nxzmns89dqjzpsc983pm3gaq7dg618jp1dzy4"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -254726,8 +254901,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.8.2"; - sha256 = "04lv8v42bs4qjjcia39grfxmabiv41dipgg5b58xgiv4ay884nfm"; + version = "3.8.3"; + sha256 = "1ksznzw5g01xgbr2zs83m0lclbhvhs6lyaszhxykni10lxyxy7v8"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -276962,6 +277137,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "versions_5_0_0" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , parser-combinators, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "5.0.0"; + sha256 = "1rfxjivdsaqc6w7dfqdycy3a81rsajvpfyi5si9ssc0w3ljfsbzr"; + libraryHaskellDepends = [ + base deepseq hashable megaparsec parser-combinators text + ]; + testHaskellDepends = [ + base megaparsec microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -278645,6 +278841,23 @@ self: { broken = true; }) {inherit (pkgs) fcgi;}; + "wai-handler-hal" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring + , case-insensitive, hal, http-types, network, text + , unordered-containers, vault, wai + }: + mkDerivation { + pname = "wai-handler-hal"; + version = "0.1.0.0"; + sha256 = "0sjw01k5dyhdi33ld1pd4mf9plpij0spzxf2b228cjyc8x5zx7rj"; + libraryHaskellDepends = [ + base base64-bytestring bytestring case-insensitive hal http-types + network text unordered-containers vault wai + ]; + description = "Wrap WAI applications to run on AWS Lambda"; + license = lib.licenses.bsd3; + }) {}; + "wai-handler-launch" = callPackage ({ mkDerivation, async, base, bytestring, http-types, process , streaming-commons, transformers, wai, warp @@ -280314,6 +280527,40 @@ self: { license = lib.licenses.mit; }) {}; + "warp_3_3_15" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.15"; + sha256 = "0nj4xxzjcy33hyfdagpc2ij6ga71r1fmc248rjgwsyfflial63bz"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + time-manager unix unix-compat vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute lifted-base + network process QuickCheck simple-sendfile stm streaming-commons + text time time-manager unix unix-compat vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -285534,6 +285781,31 @@ self: { license = lib.licenses.mit; }) {}; + "xml-conduit_1_9_1_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , bytestring, Cabal, cabal-doctest, conduit, conduit-extra + , containers, data-default-class, deepseq, doctest, hspec, HUnit + , resourcet, text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.9.1.1"; + sha256 = "1zzh7xnmbm68dab1vqsjkr6ghxqgnla5nik4amrwlmhbdih1gcdx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup bytestring conduit + conduit-extra containers data-default-class deepseq resourcet text + transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit conduit-extra containers + doctest hspec HUnit resourcet text transformers xml-types + ]; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -288411,6 +288683,28 @@ self: { license = lib.licenses.mit; }) {}; + "yesod_1_6_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit + , data-default-class, directory, fast-logger, file-embed + , monad-logger, shakespeare, streaming-commons, template-haskell + , text, unix, unordered-containers, wai, wai-extra, wai-logger + , warp, yaml, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.6.1.1"; + sha256 = "1iiaixd1xrqjcvknl9g3yvr26nbpfa2amh2ayfxmnpjlxvdhfnyn"; + libraryHaskellDepends = [ + aeson base bytestring conduit data-default-class directory + fast-logger file-embed monad-logger shakespeare streaming-commons + template-haskell text unix unordered-containers wai wai-extra + wai-logger warp yaml yesod-core yesod-form yesod-persistent + ]; + description = "Creation of type-safe, RESTful web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-alerts" = callPackage ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text , yesod-core @@ -288517,6 +288811,35 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth_1_6_10_3" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.10.3"; + sha256 = "00a7gbp2czg6ixxx62k2nmrj5g1la6cjh697y8vg9xhxq7vpyshg"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -288685,6 +289008,32 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-auth-hashdb_1_7_1_6" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers + , hspec, http-conduit, http-types, monad-logger, network-uri + , persistent, persistent-sqlite, resourcet, text + , unordered-containers, wai-extra, yesod, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-hashdb"; + version = "1.7.1.6"; + sha256 = "062f2fv4ixr5bd5xcs208xfg2i18z25g3imf86qrziv0yxxg5qpc"; + libraryHaskellDepends = [ + aeson base bytestring persistent text yesod-auth yesod-core + yesod-form yesod-persistent + ]; + testHaskellDepends = [ + aeson base basic-prelude bytestring containers hspec http-conduit + http-types monad-logger network-uri persistent-sqlite resourcet + text unordered-containers wai-extra yesod yesod-auth yesod-core + yesod-test + ]; + description = "Authentication plugin for Yesod"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-auth-hmac-keccak" = callPackage ({ mkDerivation, aeson, base, bytestring, cryptonite, mtl , persistent, random, shakespeare, text, yesod-auth, yesod-core @@ -288826,8 +289175,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.6.0.2"; - sha256 = "1rr21vclcvy4lrv6r3v6f6sslmwg49jr7jiad63snn81nz854da1"; + version = "1.6.0.3"; + sha256 = "0y57d5y0l0fzmk6zxrpf2xf8y00hp2i0lk3xh5sqlb77a57r109s"; libraryHaskellDepends = [ authenticate-oauth base bytestring text unliftio yesod-auth yesod-core yesod-form @@ -289427,6 +289776,29 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-form_1_7_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, containers, data-default + , email-validate, hspec, network-uri, persistent, resourcet + , shakespeare, text, time, transformers, wai, xss-sanitize + , yesod-core, yesod-persistent + }: + mkDerivation { + pname = "yesod-form"; + version = "1.7.0"; + sha256 = "170gby381h5pg9njn908cyx2931yiv79x3rc5npg2rd74kif06vi"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html blaze-markup + byteable bytestring containers data-default email-validate + network-uri persistent resourcet shakespeare text time transformers + wai xss-sanitize yesod-core yesod-persistent + ]; + testHaskellDepends = [ base hspec text time ]; + description = "Form handling support for Yesod Web Framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-form-bootstrap4" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, shakespeare, text , yesod-core, yesod-form @@ -289487,8 +289859,8 @@ self: { }: mkDerivation { pname = "yesod-form-multi"; - version = "1.7.0.1"; - sha256 = "0dpcyq6l28zbm12rzjp18bhjaghf38jhjzj6qp40qyvb5f8yx9dp"; + version = "1.7.0.2"; + sha256 = "1kx27680mgplmqnfjygbcf6a2bv0i9rcxbys986aaa3x785dfj02"; libraryHaskellDepends = [ base containers network-uri shakespeare text transformers yesod-core yesod-form @@ -289704,6 +290076,26 @@ self: { broken = true; }) {}; + "yesod-markdown_0_12_6_9" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , directory, hspec, pandoc, persistent, shakespeare, text + , xss-sanitize, yesod-core, yesod-form + }: + mkDerivation { + pname = "yesod-markdown"; + version = "0.12.6.9"; + sha256 = "05s63nx27f823b47yy70p9kqxi1cvfk226zgb0qhs5a2q70nxj7z"; + libraryHaskellDepends = [ + base blaze-html blaze-markup bytestring directory pandoc persistent + shakespeare text xss-sanitize yesod-core yesod-form + ]; + testHaskellDepends = [ base blaze-html hspec text ]; + description = "Tools for using markdown in a yesod application"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "yesod-media-simple" = callPackage ({ mkDerivation, base, bytestring, diagrams-cairo, diagrams-core , diagrams-lib, directory, JuicyPixels, vector, yesod From 4c71d57c99495ea405b29bf3fa7ed8f73d3d26cf Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 16 Apr 2021 17:04:45 +0200 Subject: [PATCH 34/57] haskellPackages.haskell-language-server: Fix more deps to stay compat with 1.0.0 --- .../configuration-hackage2nix.yaml | 2 + .../haskell-modules/hackage-packages.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cc6df86a7a9f..b6a24ac67274 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -82,6 +82,8 @@ default-package-overrides: - hls-retrie-plugin < 1.0.0.1 - lsp < 1.2 - lsp-types < 1.2 + - hls-plugin-api < 1.1.0.0 + - hls-explicit-imports-plugin < 1.0.0.1 # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, # so we need to restrict these to compatible versions # Remove these as soon as haskell-gi{,-base} are 0.25.* diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e5132fd5fbd7..ad2fa8e7dae0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -131977,6 +131977,24 @@ self: { }) {}; "hls-explicit-imports-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "1.0.0.0"; + sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; + revision = "1"; + editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide hls-plugin-api lsp + lsp-types shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-explicit-imports-plugin_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: @@ -131990,6 +132008,7 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hls-haddock-comments-plugin" = callPackage @@ -132030,6 +132049,25 @@ self: { }) {}; "hls-plugin-api" = callPackage + ({ mkDerivation, aeson, base, containers, data-default + , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger + , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix + , unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "1.0.0.0"; + sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hslogger lens lsp opentelemetry process regex-tdfa + shake text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + }) {}; + + "hls-plugin-api_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix @@ -132046,6 +132084,7 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage From dba0cfb2d9bf4d0b0db113e896c094e3d1fefd34 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Fri, 16 Apr 2021 17:56:26 +0200 Subject: [PATCH 35/57] yubioath-desktop: 5.0.4 -> 5.0.5 Signed-off-by: Marc 'risson' Schmitt --- ...place-git-with-normal-python-package.patch | 24 ------------------- .../misc/yubioath-desktop/default.nix | 8 ++----- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch diff --git a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch b/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch deleted file mode 100644 index d56a6cfab073..000000000000 --- a/pkgs/applications/misc/yubioath-desktop/0001-replace-git-with-normal-python-package.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5eb4d6a384753896d495b09d8651c48672ef234d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Wed, 25 Nov 2020 11:26:49 +0100 -Subject: [PATCH] replace git with normal python package -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - requirements.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/requirements.txt b/requirements.txt -index ef25aad..b4246a4 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,2 +1,2 @@ --git+https://github.com/Yubico/yubikey-manager.git -+yubikey-manager - ./py/qr --- -2.29.2 - diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index dbd33db16f9b..bb4b5afe1b28 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "yubioath-desktop"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "1aw88xvg6gjsfwmmlcrdcgyycn2cp7b8vxjzj14h7igcj02xh84h"; + sha256 = "05xs6xh9pi50h0668arirj0gnz11adpixgsdkds072077gasdm0g"; }; doCheck = false; @@ -19,10 +19,6 @@ mkDerivation rec { nativeBuildInputs = [ qmake makeWrapper python3.pkgs.wrapPython ]; - patches = [ - ./0001-replace-git-with-normal-python-package.patch - ]; - postPatch = '' substituteInPlace deployment.pri \ --replace '/usr/bin' "$out/bin" From 591ef853c741213c6f81d7b2935e64afac00701b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 16 Apr 2021 19:21:41 +0200 Subject: [PATCH 36/57] haskellPackages.lzma-static: unbreak --- 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 4338d58a69a0..5048002f0887 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1811,4 +1811,8 @@ self: super: { # PR pending https://github.com/zohl/cereal-time/pull/2 cereal-time = doJailbreak super.cereal-time; + # 2021-04-16: too strict bounds on QuickCheck and tasty + # https://github.com/hasufell/lzma-static/issues/1 + lzma-static = doJailbreak super.lzma-static; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From d5a4dec5d28729d25756345c9fe9c38b4139c340 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 16 Apr 2021 18:24:08 +0100 Subject: [PATCH 37/57] agate: fix cargoSha256 change --- pkgs/servers/gemini/agate/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index a52e759bb357..b41153caeb81 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-+X1ibnYAUB34u8+oNBSkjLtsArxlrg0Nq5zJrXi7Rfk="; }; - cargoSha256 = "sha256-ZVu7wQFe+FHWX2wevVYct1dQSE9rFET8bkmv85wNV8A="; + cargoSha256 = "sha256-EOxklOiazxhhIIv6c+N4uuItY/oFMAG0r/ATZ3Anlko="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 12d590ba3d51ac13830ccc942f997490def549ec Mon Sep 17 00:00:00 2001 From: SEbbaDK Date: Fri, 16 Apr 2021 19:30:40 +0200 Subject: [PATCH 38/57] kakounePlugins: Add pandoc.kak --- pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index b18741460890..7b6f48593049 100644 --- a/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -3,6 +3,7 @@ alexherbo2/replace-mode.kak alexherbo2/sleuth.kak andreyorst/fzf.kak andreyorst/powerline.kak +basbebe/pandoc.kak danr/kakoune-easymotion Delapouite/kakoune-buffers Delapouite/kakoune-registers From 8416de54751561be6ac14e9555047dcf1d47ddc7 Mon Sep 17 00:00:00 2001 From: "\"SEbbaDK\"" <"sebbadk@gmail.com"> Date: Fri, 16 Apr 2021 19:31:10 +0200 Subject: [PATCH 39/57] kakounePlugins: update --- .../editors/kakoune/plugins/generated.nix | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/kakoune/plugins/generated.nix b/pkgs/applications/editors/kakoune/plugins/generated.nix index 4fada31a0f54..5b1fc2be77d6 100644 --- a/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -17,12 +17,12 @@ let auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2020-10-04"; + version = "2021-03-28"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "fd735ec149ef0d9ca5f628a95b1e52858b5afbdc"; - sha256 = "07795kv9njlnp6mckwv141ny2ns6wyf5r0dfjaxh9ngd105zgif1"; + rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737"; + sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; @@ -41,12 +41,12 @@ let fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-03-15"; + version = "2021-04-03"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "4e6c9a857511fccdbbc835a1c9acb205b6486a4c"; - sha256 = "0syhhdlsm7vg6hcd2n2acag9g562z49rbb5smh5p2gnplhmp93i0"; + rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60"; + sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; @@ -65,12 +65,12 @@ let kakoune-buffers = buildKakounePluginFrom2Nix { pname = "kakoune-buffers"; - version = "2020-06-11"; + version = "2021-04-02"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-buffers"; - rev = "67959fbad727ba8470fe8cd6361169560f4fb532"; - sha256 = "09prhzz4yzf6ryw0npd1gpcfp77681vgawpp1ilfvbf25xgbbz33"; + rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd"; + sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb"; }; meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; }; @@ -147,14 +147,26 @@ let meta.homepage = "https://github.com/mayjs/openscad.kak/"; }; + pandoc-kak = buildKakounePluginFrom2Nix { + pname = "pandoc-kak"; + version = "2020-11-30"; + src = fetchFromGitHub { + owner = "basbebe"; + repo = "pandoc.kak"; + rev = "63979f7e08b86d80436bbe2d9dba173a56057b97"; + sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs"; + }; + meta.homepage = "https://github.com/basbebe/pandoc.kak/"; + }; + powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-02-25"; + version = "2021-04-06"; src = fetchFromGitHub { owner = "andreyorst"; repo = "powerline.kak"; - rev = "64ad98b6c85e63345563671b043960464d51c4b0"; - sha256 = "09w2sk19qi64hgsyg4gb407vyppnlgk272mqbinz2r3apy6szkl3"; + rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525"; + sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a"; }; meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; @@ -197,12 +209,12 @@ let tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-02-16"; + version = "2021-04-14"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "1aaa8cd89e404cbbd76d44ff8089de0951612fbf"; - sha256 = "0dfz6j6yxl65jbh4xvpiy2abr2sdjyalynzhl28y7l1gzqv4ni3j"; + rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb"; + sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; From e8635f55b48ced909f679d9c28f0201de234d4a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Apr 2021 16:55:24 +0200 Subject: [PATCH 40/57] home-assistant: 2021.4.4 -> 2021.4.5 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 32ceda4bbeba..973b73d4d16a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.4.4"; + version = "2021.4.5"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4321fb72c79d..59b7f1135cd4 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -108,7 +108,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.4.4"; + hassVersion = "2021.4.5"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -127,7 +127,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1p36ymjhirl32ax3xxdg9ia089jw1klww5imq18r6ksajafr78ys"; + sha256 = "106d1n9z8pfcnqm594vkhczrrrjap801w6fdr0psv5vhdxrqh4sj"; }; # leave this in, so users don't have to constantly update their downstream patch handling From 1a11337ccf2b071e166ec2f22a79edeb68494e5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 16 Apr 2021 19:54:30 +0200 Subject: [PATCH 41/57] python3Packages.pycomfoconnect: drop unused pytestCheckHook input --- pkgs/development/python-modules/pycomfoconnect/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pycomfoconnect/default.nix b/pkgs/development/python-modules/pycomfoconnect/default.nix index cb40ec8f5273..0c35dc4d5bac 100644 --- a/pkgs/development/python-modules/pycomfoconnect/default.nix +++ b/pkgs/development/python-modules/pycomfoconnect/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , protobuf -, pytestCheckHook }: buildPythonPackage rec { From c9bee598311d3d3c5d897a65f843f7341671ba1b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 16 Apr 2021 19:59:01 +0200 Subject: [PATCH 42/57] haskellPackages.reflex*: Fix various dependencies --- .../haskell-modules/configuration-common.nix | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5048002f0887..b964a5c101ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1242,13 +1242,7 @@ self: super: { patch = doJailbreak super.patch; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 - reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch (doJailbreak super.reflex-dom-core) (pkgs.fetchpatch { - url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch; - sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l"; - stripLen = 2; - extraPrefix = ""; - includes = ["reflex-dom-core.cabal" ]; - })))); + reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core))); # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch { @@ -1475,14 +1469,6 @@ self: super: { # https://github.com/obsidiansystems/dependent-sum/issues/55 dependent-sum = doJailbreak super.dependent-sum; - # Overspecified constraint on 'constraints'. Kinda funny, huh? - dependent-sum-aeson-orphans = appendPatch (doJailbreak super.dependent-sum-aeson-orphans) (pkgs.fetchpatch { - # 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9 - # Bump version bounds for ghc 8.10 - url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch; - sha256 = "01fj29xdblxpz4drasaygf9875fipylpj8w164lb0cszd1vmqwnb"; - }); - # 2020-11-18: https://github.com/srid/rib/issues/169 # aeson bound out of sync rib-core = doJailbreak super.rib-core; @@ -1491,20 +1477,8 @@ self: super: { # base upper bound is incompatible with ghc 8.10 neuron = doJailbreak super.neuron; - reflex = dontCheck (doJailbreak (appendPatches super.reflex [ - # https://github.com/reflex-frp/reflex/pull/444 - # Fixes for ghc 8.10 - (pkgs.fetchpatch { - url = https://github.com/reflex-frp/reflex/commit/d230632427fc1b7031163567c97f20050610c122.patch; - sha256 = "0gafqqi6q16m5y4mrc2f7lhahmazvcbiadn2v84y9p3zvx2v26xy"; - }) - # https://github.com/reflex-frp/reflex/pull/444 - # Bound bumps for ghc 8.10 - (pkgs.fetchpatch { - url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch; - sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq"; - }) - ])); + # 2020-04-16: https://github.com/reflex-frp/reflex/issues/449 + reflex = dontCheck (doJailbreak super.reflex); # 2020-11-19: jailbreaking because of pretty-simple bound out of date # https://github.com/kowainik/stan/issues/408 From c1535b26ef6fd0cc04958698c7fbcd82aa460d15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Apr 2021 20:03:12 +0200 Subject: [PATCH 43/57] hackage2nix: update list of broken packages to fix evaluation errors --- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index b6a24ac67274..f1b953553b81 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5696,6 +5696,7 @@ broken-packages: - ghcjs-xhr - ghclive - ghcprofview + - ghcup - ght - gi-cairo-again - gi-graphene @@ -10379,6 +10380,7 @@ broken-packages: - sorted - sorting - sorty + - souffle-dsl - souffle-haskell - sound-collage - sounddelay @@ -11454,6 +11456,7 @@ broken-packages: - wai-graceful - wai-handler-devel - wai-handler-fastcgi + - wai-handler-hal - wai-handler-scgi - wai-handler-snap - wai-handler-webkit From b70a9c2fc7723724059b2a820657e868a844821d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Apr 2021 20:06:42 +0200 Subject: [PATCH 44/57] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.17.0-8-ge18310f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/604db45cba2a8dcd9a7b3ac991e1bfef8c2eb116. --- .../haskell-modules/hackage-packages.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ad2fa8e7dae0..a4581a2a570b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -42592,8 +42592,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.3.1.1"; - sha256 = "0v2202zrnli49z4vw4zc6cgxvfqrv51b6p0svp0fdd2f9add4rvm"; + version = "0.4.1.0"; + sha256 = "07l9y57if58047d54g52vhpk4372aj563brbds62c3fgb5wjpdc6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50565,8 +50565,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.28.2"; - sha256 = "0hy29d34w06n7pyjycp7n3f4l6717n2z9yzjq39df05bf8xnigkj"; + version = "0.1.28.3"; + sha256 = "0w7jcq6jplr31ljdvj9cqimg1xxz9pjnsdqkncdsiywa10ngww10"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core @@ -72773,8 +72773,8 @@ self: { }: mkDerivation { pname = "deepl"; - version = "0.1.0.0"; - sha256 = "1wckhfq5g5aqzh2ybw4bbq39hn1yc1yzb8akd5vvhcip8afkkqsa"; + version = "0.1.0.1"; + sha256 = "042xkvfs3ny0gchk0a1l427hg6sd5dngw43sdwzp6c1k969s4cda"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103747,6 +103747,8 @@ self: { ]; description = "ghc toolchain installer"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghczdecode" = callPackage @@ -245035,6 +245037,8 @@ self: { ]; description = "Haskell EDSL for Souffle"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "souffle-haskell" = callPackage @@ -278895,6 +278899,8 @@ self: { ]; description = "Wrap WAI applications to run on AWS Lambda"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wai-handler-launch" = callPackage From 0d8e34906c87fad89ede376e5f1fe2e4c5150f82 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Fri, 16 Apr 2021 19:54:40 +0200 Subject: [PATCH 45/57] dasel: 1.14.0 -> 1.14.1 --- pkgs/applications/misc/dasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d482e40328ce..3f4e77bdd042 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "1g4a001k86myfln0xlzy8w9krwamvfchnvywpr1p3x6iw95z46w8"; + sha256 = "0nxdyd0zg4w1zr8p9z2x88h36vbn7ryk7160zszdiwh5qmdlv47v"; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; From a5aa71ee47347ec7dc6dff24c3aebe9c84a875db Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Thu, 8 Apr 2021 20:04:11 +0530 Subject: [PATCH 46/57] tremor-rs: 0.10.1 -> 0.11.0 Co-authored-by: Sandro --- pkgs/tools/misc/tremor-rs/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index fb1268acc6fa..ca3f3058755f 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,22 +3,26 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "1z1khxfdj2j0xf7dp0x2cd9kl6r4qicp7kc4p4sdky2yib66512y"; + sha256 = "19g0ijkclrza6s0qcbwwh3lhlkisy00ffcl0c0d7dfqwrcisgz57"; }; - cargoSha256 = "sha256-rN/d6BL2d0D0ichQR6v0543Bh/Y2ktz8ExMH50M8B8c="; + cargoSha256 = "1xv205czb2z6qpqi6vslyrx2n21510qqa11i2hwya3jdcc9lkrsd"; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ openssl ]; + # TODO export TREMOR_PATH($out/lib) variable postInstall = '' + # Copy the standard library to $out/lib + cp -r ${src}/tremor-script/lib/ $out + installShellCompletion --cmd tremor \ --bash <($out/bin/tremor completions bash) \ --fish <($out/bin/tremor completions fish) \ @@ -30,7 +34,7 @@ rustPlatform.buildRustPackage rec { # OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR = 1; - cargoBuildFlags = [ "--all" ]; + cargoBuildFlags = [ "-p tremor-cli" ]; meta = with lib; { description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; From b1c71eb215b7833afc074da11924af5b3a425815 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Fri, 16 Apr 2021 10:57:59 -0400 Subject: [PATCH 47/57] openethereum: 3.2.3 -> 3.2.4 See: https://github.com/openethereum/openethereum/releases/tag/v3.2.4 --- pkgs/applications/blockchains/openethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/openethereum/default.nix b/pkgs/applications/blockchains/openethereum/default.nix index 5b51d162d0f3..82b6f2c1adb7 100644 --- a/pkgs/applications/blockchains/openethereum/default.nix +++ b/pkgs/applications/blockchains/openethereum/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "openethereum"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "openethereum"; repo = "openethereum"; rev = "v${version}"; - sha256 = "1j7wfgpnvf9pcprd53sbd3pa7yz9588z81i1bx12wmj1fja3xa0j"; + sha256 = "143w0b0ff1s73qzr844l25w90d2y2z0b3w2fr5kkbc1wsnpcq7jp"; }; - cargoSha256 = "0ha18caw8mxzrh984y2z148cmdijrjxf0rc8j4ccwvmrbdsaz1xn"; + cargoSha256 = "1gm02pcfll362add8a0dcb0sk0mag8z0q23b87yb6fs870bqvhib"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = [ From fbffc54ac81497653cdcaddabfd446b7292b7eee Mon Sep 17 00:00:00 2001 From: devhell Date: Fri, 16 Apr 2021 20:16:02 +0100 Subject: [PATCH 48/57] profanity: Enable clipboard support Clipboard support was actually introduced in version `0.8.0`, and this change flew completely over my head. Now the /paste command should actually work by default and as expected. --- .../networking/instant-messengers/profanity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 5aaed6eb211b..e7f8a9e77261 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # Enable feature flags, so that build fail if libs are missing configureFlags = [ "--enable-c-plugins" "--enable-otr" ] ++ optionals notifySupport [ "--enable-notifications" ] - ++ optionals traySupport [ "--enable-icons" ] + ++ optionals traySupport [ "--enable-icons-and-clipboard" ] ++ optionals pgpSupport [ "--enable-pgp" ] ++ optionals pythonPluginSupport [ "--enable-python-plugins" ] ++ optionals omemoSupport [ "--enable-omemo" ]; From b623794aba1915e0dfa1d7731f28d59967ae6c9d Mon Sep 17 00:00:00 2001 From: JonathanILevi <35940342+JonathanILevi@users.noreply.github.com> Date: Fri, 16 Apr 2021 14:33:08 -0500 Subject: [PATCH 49/57] dmd: mark unbroken (#119647) It is building fine locally, tested by myself and @SuperSandro2000 (who had added the broken tag). Should this be tested on hydra before removing it? I don't know if that is even possible. --- pkgs/development/compilers/dmd/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 51f30dbabdaf..3ae72e5862f7 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -170,6 +170,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ThomasMader lionello ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; # many tests are failing - broken = true; }; } From 1766f30971795e524eac5138bfa53c676ffaedad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 16 Apr 2021 21:45:43 +0200 Subject: [PATCH 50/57] yubioath-desktop: fix icon --- pkgs/applications/misc/yubioath-desktop/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index bb4b5afe1b28..9cfd7650c49f 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ - --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" + --replace 'Icon=com.yubico.yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" ''; meta = with lib; { From dfb0999f7355c9caa40eee45b87bfc9071e09fdc Mon Sep 17 00:00:00 2001 From: Philip Potter Date: Fri, 16 Apr 2021 16:19:18 +0100 Subject: [PATCH 51/57] yubikey-agent: fix systemd unit I was getting problems with the unit failing to start due to NAMESPACE or CAPABILITIES permissions. Upstream now provides a systemd unit file in the repo, we should use that one, and that one works for me. --- pkgs/tools/security/yubikey-agent/default.nix | 10 +++--- .../yubikey-agent/yubikey-agent.service | 35 ------------------- 2 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 pkgs/tools/security/yubikey-agent/yubikey-agent.service diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index d4f3e1567caa..305f5a4fe799 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yubikey-agent"; - version = "0.1.3"; + version = "unstable-2021-02-18"; src = fetchFromGitHub { owner = "FiloSottile"; repo = pname; - rev = "v${version}"; - sha256 = "07gix5wrakn4z846zhvl66lzwx58djrfnn6m8v7vc69l9jr3kihr"; + rev = "8cadc13d107757f8084d9d2b93ea64ff0c1748e8"; + sha256 = "1lklgq9qkqil5s0g56wbhs0vpr9c1bd4ir7bkrjwqj75ygxim8ml"; }; buildInputs = @@ -25,7 +25,7 @@ buildGoModule rec { substituteInPlace main.go --replace 'notify-send' ${libnotify}/bin/notify-send ''; - vendorSha256 = "128mlsagj3im6h0p0ndhzk29ya47g19im9dldx3nmddf2jlccj2h"; + vendorSha256 = "1zx1w2is61471v4dlmr4wf714zqsc8sppik671p7s4fis5vccsca"; doCheck = false; @@ -42,7 +42,7 @@ buildGoModule rec { # See https://github.com/FiloSottile/yubikey-agent/pull/43 + lib.optionalString stdenv.isLinux '' mkdir -p $out/lib/systemd/user - substitute ${./yubikey-agent.service} $out/lib/systemd/user/yubikey-agent.service \ + substitute contrib/systemd/user/yubikey-agent.service $out/lib/systemd/user/yubikey-agent.service \ --replace 'ExecStart=yubikey-agent' "ExecStart=$out/bin/yubikey-agent" ''; diff --git a/pkgs/tools/security/yubikey-agent/yubikey-agent.service b/pkgs/tools/security/yubikey-agent/yubikey-agent.service deleted file mode 100644 index 7a91f902544e..000000000000 --- a/pkgs/tools/security/yubikey-agent/yubikey-agent.service +++ /dev/null @@ -1,35 +0,0 @@ -[Unit] -Description=Seamless ssh-agent for YubiKeys -Documentation=https://filippo.io/yubikey-agent - -[Service] -ExecStart=yubikey-agent -l %t/yubikey-agent/yubikey-agent.sock -ExecReload=/bin/kill -HUP $MAINPID -ProtectSystem=strict -ProtectKernelLogs=yes -ProtectKernelModules=yes -ProtectKernelTunables=yes -ProtectControlGroups=yes -ProtectClock=yes -ProtectHostname=yes -PrivateTmp=yes -PrivateDevices=yes -PrivateUsers=yes -IPAddressDeny=any -RestrictAddressFamilies=AF_UNIX -RestrictNamespaces=yes -RestrictRealtime=yes -RestrictSUIDSGID=yes -LockPersonality=yes -CapabilityBoundingSet= -SystemCallFilter=@system-service -SystemCallFilter=~@privileged @resources -SystemCallErrorNumber=EPERM -SystemCallArchitectures=native -NoNewPrivileges=yes -KeyringMode=private -UMask=0177 -RuntimeDirectory=yubikey-agent - -[Install] -WantedBy=default.target From 0f1e22421ee476f79edd948c7d83dd38750f4233 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 15 Apr 2021 00:47:42 +0200 Subject: [PATCH 52/57] go_1_16: 1.16.2 -> 1.16.3 --- pkgs/development/compilers/go/1.16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.16.nix b/pkgs/development/compilers/go/1.16.nix index d6690a71088e..f82a0d72b7ad 100644 --- a/pkgs/development/compilers/go/1.16.nix +++ b/pkgs/development/compilers/go/1.16.nix @@ -11,7 +11,7 @@ let inherit (lib) optionals optionalString; - version = "1.16.2"; + version = "1.16.3"; go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1sl33wkhp6pi9f15f6khp5a7l7xwmpc3sp1zmji8pjr3g8l19jip"; + sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU="; }; # perl is used for testing go vet From ab16ad87649b6ea845be46fa7df7e9466ed4e05d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 12 Apr 2021 21:52:54 +0200 Subject: [PATCH 53/57] =?UTF-8?q?coq=5F8=5F13:=208.13.1=20=E2=86=92=208.13?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/coq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 560e8dd733af..20a17b11221a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -43,6 +43,7 @@ let "8.12.2".sha256 = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; "8.13.0".sha256 = "0sjbqmz6qcvnz0hv87xha80qbhvmmyd675wyc5z4rgr34j2l1ymd"; "8.13.1".sha256 = "0xx2ns84mlip9bg2mkahy3pmc5zfcgrjxsviq9yijbzy1r95wf0n"; + "8.13.2".sha256 = "1884vbmwmqwn9ngibax6dhnqh4cc02l0s2ajc6jb1xgr0i60whjk"; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix From 12268047412f56657c4366c82471333c9783bfd7 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Fri, 16 Apr 2021 19:33:43 +0200 Subject: [PATCH 54/57] stretchly: 1.5.0 -> 1.6.0 --- pkgs/applications/misc/stretchly/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 6480fd6b2675..52c5f542b276 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -5,18 +5,17 @@ , electron , common-updater-scripts , writeShellScript -, jq , makeDesktopItem }: stdenv.mkDerivation rec { pname = "stretchly"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; - sha256 = "19czwmwqsn82zdzln9zqqyl9sb3dm95gp58dqn1459gyinkzpvda"; + sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d"; }; icon = fetchurl { From 0139874db9bca4be6f54c52f2da40e8ac7c5237b Mon Sep 17 00:00:00 2001 From: Sandro Date: Sat, 17 Apr 2021 00:25:03 +0200 Subject: [PATCH 55/57] nixos/nginx: add upstreams examples (#118447) * nixos/nginx: add upstreams examples I am not fully sure if they are fully correct but they deployed the right syntax. * nixos/nginx: use literal example * Update nixos/modules/services/web-servers/nginx/default.nix * Update nixos/modules/services/web-servers/nginx/default.nix --- nixos/modules/services/web-servers/nginx/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 7591ad0c3d24..389911ffcce8 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -676,6 +676,7 @@ in Defines the address and other parameters of the upstream servers. ''; default = {}; + example = { "127.0.0.1:8000" = {}; }; }; extraConfig = mkOption { type = types.lines; @@ -690,6 +691,14 @@ in Defines a group of servers to use as proxy target. ''; default = {}; + example = literalExample '' + "backend_server" = { + servers = { "127.0.0.1:8000" = {}; }; + extraConfig = '''' + keepalive 16; + ''''; + }; + ''; }; virtualHosts = mkOption { From 0aa8f9e52068b03e3dca9944007dc159f6820a1e Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 17 Apr 2021 00:38:33 +0200 Subject: [PATCH 56/57] kodi{-wayland,-gbm}: use LTS jdk11 (#119611) --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34cf48f154d6..54d1dcb1a390 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26843,10 +26843,12 @@ in }; kodi-wayland = callPackage ../applications/video/kodi { + jre_headless = jdk11_headless; waylandSupport = true; }; kodi-gbm = callPackage ../applications/video/kodi { + jre_headless = jdk11_headless; gbmSupport = true; }; From f7cb740de8df969ae4cecd21684b822823830093 Mon Sep 17 00:00:00 2001 From: Marc Seeger Date: Fri, 16 Apr 2021 15:43:03 -0700 Subject: [PATCH 57/57] ntp: set platforms to unix (#119644) Co-authored-by: Sandro --- pkgs/tools/networking/ntp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 281441049327..8c62e3b0d646 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; }; maintainers = with maintainers; [ eelco thoughtpolice ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }