From c19dbef946b86c72d7d944a51d3a38dd36d08a61 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 27 Oct 2022 01:06:16 +0800 Subject: [PATCH 01/55] perlPackages.IOAsync: 0.801 -> 0.802 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b16f8844856e..4b6de1b4986f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11998,10 +11998,10 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.801"; + version = "0.802"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.801.tar.gz"; - hash = "sha256-ieRZuhe3alcrsbS7EgMBVB6MyTJCQXFmI2tsbbDhybk="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.802.tar.gz"; + hash = "sha256-5YJzFXd2fEfqxDXvKQRmPUp1Cw5oAqSmGJo38Mswhzg"; }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; From b8dfcc76d6a4622b7a48d1b9de68e6d4ee10c942 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 5 Nov 2022 03:41:49 +0100 Subject: [PATCH 02/55] grass: migrate to wxPython_4_2 --- pkgs/applications/gis/grass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 5d1411bfcc07..bffbcf48fabd 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config bison flex makeWrapper wrapGAppsHook gdal geos libmysqlclient netcdf pdal - ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_1 ]); + ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); buildInputs = [ cairo zlib proj libtiff libpng fftw sqlite From 9b7903ffbaf195f8bcbad80024d28f58f79f8ac3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 18:52:35 +0100 Subject: [PATCH 03/55] haskellPackages: stackage LTS 19.31 -> LTS 19.32 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index b1c215ade1c6..a359d8ef4224 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.31 +# Stackage LTS 19.32 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -462,7 +462,7 @@ default-package-overrides: - crypto-pubkey-types ==0.4.3 - crypto-random ==0.0.9 - crypto-random-api ==0.2.0 - - cryptostore ==0.2.2.0 + - cryptostore ==0.2.3.0 - crypt-sha512 ==0 - csp ==1.4.0 - css-text ==0.1.3.0 @@ -649,7 +649,7 @@ default-package-overrides: - elerea ==2.9.0 - elf ==0.31 - eliminators ==0.8 - - elm-bridge ==0.8.0 + - elm-bridge ==0.8.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elynx ==0.6.1.1 @@ -682,7 +682,7 @@ default-package-overrides: - error-or-utils ==0.2.0 - errors ==2.3.0 - errors-ext ==0.4.2 - - ersatz ==0.4.12 + - ersatz ==0.4.13 - esqueleto ==3.5.8.1 - essence-of-live-coding ==0.2.6 - essence-of-live-coding-gloss ==0.2.6 @@ -1611,7 +1611,7 @@ default-package-overrides: - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.2.1 - - mysql-simple ==0.4.8.1 + - mysql-simple ==0.4.9 - n2o ==0.11.1 - n2o-nitro ==0.11.2 - nagios-check ==0.3.2 @@ -1734,7 +1734,7 @@ default-package-overrides: - optparse-simple ==0.1.1.4 - optparse-text ==0.1.1.0 - OrderedBits ==0.0.2.0 - - ordered-containers ==0.2.2 + - ordered-containers ==0.2.3 - ormolu ==0.3.1.0 - overhang ==1.0.0 - packcheck ==0.6.0 @@ -1874,7 +1874,7 @@ default-package-overrides: - postgresql-binary ==0.12.5 - postgresql-libpq ==0.9.4.3 - postgresql-libpq-notify ==0.2.0.0 - - postgresql-migration ==0.2.1.4 + - postgresql-migration ==0.2.1.6 - postgresql-orm ==0.5.1 - postgresql-query ==3.9.0 - postgresql-schema ==0.1.14 @@ -2077,7 +2077,7 @@ default-package-overrides: - riak-protobuf ==0.25.0.0 - rio ==0.1.22.0 - rio-orphans ==0.1.2.0 - - rio-prettyprint ==0.1.1.0 + - rio-prettyprint ==0.1.2.0 - rng-utils ==0.3.1 - roc-id ==0.1.0.0 - rocksdb-haskell ==1.0.1 @@ -2252,7 +2252,7 @@ default-package-overrides: - skylighting-core ==0.12.3.1 - slack-progressbar ==0.1.0.1 - slave-thread ==1.1.0.1 - - slist ==0.2.0.1 + - slist ==0.2.1.0 - slynx ==0.6.1.1 - smallcheck ==1.2.1 - smash ==0.1.3 From 09eb71ff7c9c5948aa0b6dc047b684de33c6a0d0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 18:52:56 +0100 Subject: [PATCH 04/55] all-cabal-hashes: 2022-11-03T21:09:38Z -> 2022-11-11T17:48:48Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 29dfcfc10cfb..5b654ec8ad0d 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7e2dca1338ee7f19dbb8cdbc81e9eb1716bbf64e.tar.gz", - "sha256": "1vrhv9w042sn2sm3niiy5640qvhiqn79zllp4vsbdpds758rj9vm", - "msg": "Update from Hackage at 2022-11-03T21:09:38Z" + "commit": "e2ccf8a8796c9192280f796ce0f5d98ec783f856", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e2ccf8a8796c9192280f796ce0f5d98ec783f856.tar.gz", + "sha256": "092g4pbxyhkw1isbib967v5aw16iqs3w5iqcicv1irr4rphsr06z", + "msg": "Update from Hackage at 2022-11-11T17:48:48Z" } From 8318b634a1b0d2f7811937155481abe5250afaa5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 18:55:13 +0100 Subject: [PATCH 05/55] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 869 +++++++++++------- 1 file changed, 532 insertions(+), 337 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 84a307b58245..b46fbdc286d5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2069,15 +2069,17 @@ self: { }: mkDerivation { pname = "Blammo"; - version = "1.1.0.0"; - sha256 = "02j49dzwlx0p39njspz10vbj5qybb1l2l2lk4gdrbicp953czaa8"; + version = "1.1.1.0"; + sha256 = "1hqrdzj30lwwb7zis2hkfz887jh107k33mbqkj2hxvd56sc4din5"; libraryHaskellDepends = [ aeson base bytestring case-insensitive clock containers dlist envparse exceptions fast-logger http-types lens monad-logger-aeson mtl text time unliftio unliftio-core unordered-containers vector wai ]; - testHaskellDepends = [ aeson base hspec markdown-unlit mtl text ]; + testHaskellDepends = [ + aeson base bytestring hspec markdown-unlit mtl text time + ]; testToolDepends = [ markdown-unlit ]; description = "Batteries-included Structured Logging library"; license = lib.licenses.mit; @@ -7994,10 +7996,8 @@ self: { }: mkDerivation { pname = "H"; - version = "0.9.0.1"; - sha256 = "0d3isp467pq5l1c95j0q6s2isywz8xamgrm9rs16i7xczkz4vh2z"; - revision = "1"; - editedCabalFile = "07pddiap3jzcnc09v442wq30j46nmkdibilzcv69hz5imcnmhz0h"; + version = "1.0.0"; + sha256 = "1xnv8a097pidh4q9ngrsha0vm9sgsbggblizcjz449iwwsb8yg9g"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -14236,6 +14236,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "MonadRandom_0_6" = callPackage + ({ mkDerivation, base, mtl, primitive, random, transformers + , transformers-compat + }: + mkDerivation { + pname = "MonadRandom"; + version = "0.6"; + sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; + libraryHaskellDepends = [ + base mtl primitive random transformers transformers-compat + ]; + description = "Random-number generation monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "MonadRandomLazy" = callPackage ({ mkDerivation, base, MonadRandom, mtl, random }: mkDerivation { @@ -15328,23 +15344,23 @@ self: { }) {}; "ONC-RPC" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cereal, containers - , filepath, haskell-src-exts, network, parsec, random, time, unix - , vector + ({ mkDerivation, base, base16-bytestring, bytestring, Cabal, cereal + , containers, filepath, haskell-src-exts, network, parsec, random + , time, unix, vector }: mkDerivation { pname = "ONC-RPC"; - version = "0.1"; - sha256 = "19smd0rp0jx9i59jgjk149g4czpwjx173szhp1z9dvm5j0pdwyy5"; + version = "0.2"; + sha256 = "0aqhvw6kqsd3b6wlyjhrz4ijc1b4ch57398icjfy7gr1a8g3z3c0"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ - base bytestring Cabal cereal containers filepath haskell-src-exts - parsec vector + base base16-bytestring bytestring Cabal cereal containers filepath + haskell-src-exts parsec vector ]; libraryHaskellDepends = [ - base bytestring Cabal cereal containers filepath haskell-src-exts - network parsec random time unix vector + base base16-bytestring bytestring Cabal cereal containers filepath + haskell-src-exts network parsec random time unix vector ]; executableHaskellDepends = [ base filepath ]; description = "ONC RPC (aka Sun RPC) and XDR library"; @@ -26203,6 +26219,37 @@ self: { broken = true; }) {}; + "aeson-schemas_1_4_0_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, criterion, deepseq + , filepath, first-class-families, hashable, hint, interpolate + , megaparsec, process, QuickCheck, raw-strings-qq, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, text, th-orphans, th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.4.0.0"; + sha256 = "0nch4andx0w0l7dlw64ajz503f05zancx42178dsd5fskvd75ks2"; + libraryHaskellDepends = [ + aeson base first-class-families hashable megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base deepseq filepath first-class-families hashable + hint interpolate megaparsec process QuickCheck raw-strings-qq tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell + temporary text th-orphans th-test-utils unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson base criterion deepseq first-class-families hashable + megaparsec template-haskell text th-test-utils unordered-containers + ]; + description = "Easily consume JSON data on-demand with type-safety"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -26335,7 +26382,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "aeson-typescript_0_4_1_0" = callPackage + "aeson-typescript_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, hspec, mtl, process, string-interpolate , template-haskell, temporary, text, th-abstraction, transformers @@ -26343,8 +26390,8 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.4.1.0"; - sha256 = "0zr6p0yyzm1mdhnyycd37alw3xg2jmx303mbd5a7251wffxc42n8"; + version = "0.4.2.0"; + sha256 = "00lv7mfxxnhmbxh9s1qwfnffmpy6095fh3zms68bzdkjik2hk830"; libraryHaskellDepends = [ aeson base containers mtl string-interpolate template-haskell text th-abstraction transformers unordered-containers @@ -33234,24 +33281,25 @@ self: { "appendful-persistent" = callPackage ({ mkDerivation, appendful, base, containers, genvalidity - , genvalidity-appendful, genvalidity-hspec, genvalidity-persistent - , hspec, microlens, monad-logger, mtl, path, path-io, persistent - , persistent-sqlite, persistent-template, QuickCheck, text - , validity + , genvalidity-appendful, genvalidity-persistent + , genvalidity-sydtest, microlens, monad-logger, mtl, path, path-io + , persistent, persistent-sqlite, persistent-template, QuickCheck + , sydtest, sydtest-discover, text, validity }: mkDerivation { pname = "appendful-persistent"; - version = "0.0.0.0"; - sha256 = "0h0hdjkkrz8ckhs8r8n0vm983513lahi9bd89i1hyqlycrckbphl"; + version = "0.1.0.0"; + sha256 = "0aw463j5qyjazzj7w325fn85nyz3i7rml1c5f02ps06n9rhw0w1k"; libraryHaskellDepends = [ appendful base containers microlens persistent ]; testHaskellDepends = [ appendful base containers genvalidity genvalidity-appendful - genvalidity-hspec genvalidity-persistent hspec monad-logger mtl - path path-io persistent persistent-sqlite persistent-template - QuickCheck text validity + genvalidity-persistent genvalidity-sydtest monad-logger mtl path + path-io persistent persistent-sqlite persistent-template QuickCheck + sydtest text validity ]; + testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; }) {}; @@ -38249,8 +38297,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.22.1"; - sha256 = "0zz8f144rsd7bpl4xfxw3wbp9s1a300c8i6vifh2yfhi798j76n4"; + version = "0.23"; + sha256 = "0kfdj9hxjvziq1y74xj9mm17zcgwywpvp9c0i6gfd5malf4qxgg0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42017,6 +42065,17 @@ self: { broken = true; }) {}; + "benri-hspec" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "benri-hspec"; + version = "0.1.0.0"; + sha256 = "0vvc7fw52c9flmdjmgrc9cca9yrl4r7yvh2l5ixc23gvvmlhdycy"; + libraryHaskellDepends = [ base hspec ]; + description = "Simplify tests where Either or Maybe types are returned from monadic code"; + license = lib.licenses.bsd3; + }) {}; + "bento" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47810,6 +47869,28 @@ self: { broken = true; }) {}; + "borsh" = callPackage + ({ mkDerivation, base, bytestring, containers, generics-sop, memory + , optics-core, profunctors, QuickCheck, quickcheck-instances + , sop-core, tasty, tasty-quickcheck, text, vector, wide-word + }: + mkDerivation { + pname = "borsh"; + version = "0.1.0"; + sha256 = "0nyv91sn2v8m1zlp789v85dm9n21k9gb532rkzhdds5fpvqa6w3z"; + libraryHaskellDepends = [ + base bytestring containers generics-sop memory sop-core text vector + wide-word + ]; + testHaskellDepends = [ + base bytestring containers generics-sop optics-core profunctors + QuickCheck quickcheck-instances sop-core tasty tasty-quickcheck + text + ]; + description = "Implementation of BORSH serialisation"; + license = lib.licenses.bsd3; + }) {}; + "bot" = callPackage ({ mkDerivation, arrows, base, Stream }: mkDerivation { @@ -48507,8 +48588,8 @@ self: { }: mkDerivation { pname = "brick-panes"; - version = "1.0.0.1"; - sha256 = "05f5c99b44c6aajx12hx4ayxjldbj4n0fi70i95q18qxy9aacljw"; + version = "1.0.0.2"; + sha256 = "1g6q9pnc0a0fnp2qaxqxp8qdriifi6w362ky36csxl633nl6gsw0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vty ]; @@ -50502,6 +50583,8 @@ self: { pname = "byteslice"; version = "0.2.7.0"; sha256 = "1mzqlyh0mswk64irz0sr8fk0v9y9ksb1k1j3g51l9vhhnz0cavhj"; + revision = "1"; + editedCabalFile = "1g5670xillqbfpnsxppfjkvaaff4rjlk6116pc5s1pds0zsnbyy8"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st tuples vector @@ -63474,6 +63557,23 @@ self: { license = lib.licenses.mit; }) {}; + "commonmark-wikilink" = callPackage + ({ mkDerivation, aeson, base, commonmark, commonmark-pandoc + , megaparsec, network-uri, pandoc-types, parsec, relude, uri-encode + , url-slug + }: + mkDerivation { + pname = "commonmark-wikilink"; + version = "0.1.0.0"; + sha256 = "1varv4zihai08wvgpsf9pp3qaa1wniii21qhgy39cpcz9n9s2hv2"; + libraryHaskellDepends = [ + aeson base commonmark commonmark-pandoc megaparsec network-uri + pandoc-types parsec relude uri-encode url-slug + ]; + description = "Obsidian-friendly commonmark wikilink parser"; + license = lib.licenses.mit; + }) {}; + "commsec" = callPackage ({ mkDerivation, base, bytestring, cipher-aes128, crypto-api , network @@ -68308,8 +68408,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.11"; - sha256 = "1g542m2bk0avnsnrzc0y1dqy5k91i0d9p5fd8ir39gpaa8024ih2"; + version = "3.12"; + sha256 = "0svbn9djzxqbmi62106i2692fx31vdxqjjd2y329nlq36iivvyxf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -68327,8 +68427,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.11"; - sha256 = "0xz92m8rhcb1l7533lxd5sbnisld2ss0h2sm18bxdig22v4qlzh5"; + version = "3.12"; + sha256 = "0xxvdl1k09il545y263k5x37gi5z1y4plm8f4yjqh3hprv23ffhp"; libraryHaskellDepends = [ base copilot-core directory filepath language-c99 language-c99-simple mtl pretty @@ -68360,8 +68460,8 @@ self: { }: mkDerivation { pname = "copilot-core"; - version = "3.11"; - sha256 = "01h21a40v233qphm03fb9y18iwisnznpdvjvciy3kcc756rvranx"; + version = "3.12"; + sha256 = "1aw6pkxqpcwqib86yq2zvjz6jqxjc3ina0hbxsyvmgmcqs5hwybs"; libraryHaskellDepends = [ base dlist pretty ]; testHaskellDepends = [ base HUnit pretty QuickCheck test-framework test-framework-hunit @@ -68390,17 +68490,17 @@ self: { }) {}; "copilot-interpreter" = callPackage - ({ mkDerivation, base, copilot-core, pretty, QuickCheck - , test-framework, test-framework-quickcheck2 + ({ mkDerivation, base, copilot-core, copilot-prettyprinter, pretty + , QuickCheck, test-framework, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-interpreter"; - version = "3.11"; - sha256 = "1w6acc3hzjyai20l52qxhnx165i8ywra8jpc2nqvyji13fq433z6"; + version = "3.12"; + sha256 = "100nalpd7q9z26nyk06nbl4hr8p6akm8qny988zd8znp2c3z37rr"; libraryHaskellDepends = [ base copilot-core pretty ]; testHaskellDepends = [ - base copilot-core pretty QuickCheck test-framework - test-framework-quickcheck2 + base copilot-core copilot-prettyprinter pretty QuickCheck + test-framework test-framework-quickcheck2 ]; description = "Interpreter for Copilot"; license = lib.licenses.bsd3; @@ -68408,17 +68508,17 @@ self: { "copilot-language" = callPackage ({ mkDerivation, array, base, containers, copilot-core - , copilot-interpreter, copilot-theorem, data-reify, HUnit, mtl - , pretty, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , copilot-interpreter, copilot-prettyprinter, copilot-theorem + , data-reify, HUnit, mtl, pretty, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "copilot-language"; - version = "3.11"; - sha256 = "1j0bvlplm5pz2yf09b7n716mvkkc7n6gq25fkghmqb1ndaffz5m3"; + version = "3.12"; + sha256 = "1n2n83617wi0piw94g843zk39xvralcn7l8vdcvbx6gwqm9dn320"; libraryHaskellDepends = [ array base containers copilot-core copilot-interpreter - copilot-theorem data-reify mtl + copilot-prettyprinter copilot-theorem data-reify mtl ]; testHaskellDepends = [ base copilot-core copilot-interpreter HUnit pretty QuickCheck @@ -68433,8 +68533,8 @@ self: { ({ mkDerivation, base, containers, copilot-language, mtl, parsec }: mkDerivation { pname = "copilot-libraries"; - version = "3.11"; - sha256 = "0cvz3vq6k48yq5qjhdnzn3shgjfdyrbb480721nkmqml0v64p213"; + version = "3.12"; + sha256 = "0xxfz2r04x0cwyidlfd792v4jspv38v8w012w0dmr0ajsw15npxb"; libraryHaskellDepends = [ base containers copilot-language mtl parsec ]; @@ -68443,6 +68543,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "copilot-prettyprinter" = callPackage + ({ mkDerivation, base, copilot-core, pretty }: + mkDerivation { + pname = "copilot-prettyprinter"; + version = "3.12"; + sha256 = "1sj4fjj6kwarjxn53qrfvl0ca200ra9hnh8mrisc4jr87xhdbnh0"; + libraryHaskellDepends = [ base copilot-core pretty ]; + description = "A prettyprinter of Copilot Specifications"; + license = lib.licenses.bsd3; + }) {}; + "copilot-sbv" = callPackage ({ mkDerivation, base, containers, copilot-core, directory , filepath, pretty, sbv @@ -68462,17 +68573,18 @@ self: { "copilot-theorem" = callPackage ({ mkDerivation, base, bimap, bv-sized, containers, copilot-core - , data-default, directory, libBF, mtl, panic, parameterized-utils - , parsec, pretty, process, random, transformers, what4, xml + , copilot-prettyprinter, data-default, directory, libBF, mtl, panic + , parameterized-utils, parsec, pretty, process, random + , transformers, what4, xml }: mkDerivation { pname = "copilot-theorem"; - version = "3.11"; - sha256 = "1nrcm5vzjlqch2ff3vpjrlqjjm0j58p74md3wvpb0swr85j1calf"; + version = "3.12"; + sha256 = "1q0r8fa4jvqpkiy099f9fmrcm2qy0wrvxwkaycbqlhgx1zixxl3z"; libraryHaskellDepends = [ - base bimap bv-sized containers copilot-core data-default directory - libBF mtl panic parameterized-utils parsec pretty process random - transformers what4 xml + base bimap bv-sized containers copilot-core copilot-prettyprinter + data-default directory libBF mtl panic parameterized-utils parsec + pretty process random transformers what4 xml ]; description = "k-induction for Copilot"; license = lib.licenses.bsd3; @@ -71463,8 +71575,8 @@ self: { }: mkDerivation { pname = "cryptostore"; - version = "0.2.2.0"; - sha256 = "0n70amg7y2qwfjhj4xaqjia46fbabba9l2g19ry191m7c4zp1skx"; + version = "0.2.3.0"; + sha256 = "1w84klg3r10vapkc8s6q21ldnp3014x9nvi5ffsmzikn7g7pw1g5"; libraryHaskellDepends = [ asn1-encoding asn1-types base basement bytestring cryptonite hourglass memory pem x509 x509-validation @@ -74281,8 +74393,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "data-elevator"; - version = "0.1.0.0"; - sha256 = "1pv9z25fmqrjyh0zfbiy8wmcmhsr2r6x3hip8zgavaa7f5qb8n4y"; + version = "0.1.0.1"; + sha256 = "0j2adsqn3r23jjwl5p0kyf2z1wd2kibfqivdcchngsmf3yfr34sz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Coerce between unlifted boxed and lifted types"; @@ -77907,8 +78019,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.2.0"; - sha256 = "1wpb5p07vvny0bhapi87iwh43nykgy6b25xmsxsp403mbnv9g9ws"; + version = "0.6.4.0"; + sha256 = "1xrazkn8pdzkjrcia9ndxiva483w9fyclcq562assnv9j3svi145"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -77955,8 +78067,8 @@ self: { }: mkDerivation { pname = "dep-t-dynamic"; - version = "0.1.0.2"; - sha256 = "0dv7ydxqgmgphcjgphrdf6jghkykvg5nnppgpgglwi2rg7yfmp7i"; + version = "0.1.1.0"; + sha256 = "1vh4igb25di61by6dhfnv2ans2ryk6j2sh8bp8rp8yawnwsidyx9"; libraryHaskellDepends = [ algebraic-graphs base dep-t hashable sop-core transformers unordered-containers @@ -79251,8 +79363,8 @@ self: { pname = "dhall"; version = "1.41.2"; sha256 = "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"; - revision = "2"; - editedCabalFile = "18jh1c2zinwglih5gc8av2szicyywq5q0kl2h5200sm67nxmask9"; + revision = "3"; + editedCabalFile = "1j8hhg6jxzvg1lh5lad9wp54fi0znq5syfxa7rpr6sw0v6257fi1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -79432,8 +79544,8 @@ self: { pname = "dhall-docs"; version = "1.0.10"; sha256 = "1rh6nxmjin8kvbscbhbcjsgxnlkw1r19plzpps6wkx86zfjd2ms2"; - revision = "2"; - editedCabalFile = "1zm07bnaf6j0h5x2rlyvi4fs5d42w2v5z11qxc7gysqp1k2p99m1"; + revision = "3"; + editedCabalFile = "06pjafliw9a3pzw9846yb9rmsjrwrn7jhax7s2bsdasx5agdrfg5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -80239,8 +80351,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.4"; sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; - revision = "6"; - editedCabalFile = "1jdya89yf8r11mr0b587w7k4f5g40709048wxpijczla169f4is8"; + revision = "7"; + editedCabalFile = "0jwj06c2bqawpr57y2x8hbnjlsl1nv9k7wjxhk56w240qyspmj3p"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -83661,18 +83773,19 @@ self: { }) {}; "dnf-repo" = callPackage - ({ mkDerivation, base, directory, extra, filepath, Glob, simple-cmd - , simple-cmd-args + ({ mkDerivation, base, directory, extra, filepath, Glob + , http-directory, simple-cmd, simple-cmd-args }: mkDerivation { pname = "dnf-repo"; - version = "0.5"; - sha256 = "1adpbm76kra59jgbrx2b1lzi06lq3znwqy8wapx0p5qsf630kilw"; + version = "0.5.1"; + sha256 = "158gfmdwf77yd623782pjv4702xjnqfr5dxwl4chrbanvsdfg7si"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base directory extra filepath Glob simple-cmd simple-cmd-args + base directory extra filepath Glob http-directory simple-cmd + simple-cmd-args ]; testHaskellDepends = [ base simple-cmd ]; description = "DNF wrapper tool to control repos"; @@ -88410,8 +88523,8 @@ self: { }: mkDerivation { pname = "effectful"; - version = "2.2.0.0"; - sha256 = "0zymvpg7bbvgwpziqj3bfpxbb77d45kph0qcrdilfi9w1bbjg63r"; + version = "2.2.1.0"; + sha256 = "0p2kr9vcyhcpvyrqbvwmjjh4k2lsrrhhq6rdi087iyvd7vj33al2"; libraryHaskellDepends = [ async base bytestring directory effectful-core process stm time unliftio @@ -88433,8 +88546,8 @@ self: { }: mkDerivation { pname = "effectful-core"; - version = "2.2.0.0"; - sha256 = "0i4ybsqkamsg91vp4pkr7pxpscfk5n44far9c53cbnh49nx14jqg"; + version = "2.2.1.0"; + sha256 = "0439fk1gr2jq663zl6p0ra9hkzmjm9ad24wnbrbz1nnl5v01ay2s"; libraryHaskellDepends = [ base containers exceptions monad-control primitive transformers-base unliftio-core @@ -89473,8 +89586,8 @@ self: { }: mkDerivation { pname = "elm-bridge"; - version = "0.8.0"; - sha256 = "05xnbwxzxm80xccrd5g4f83gsvs7gmyg9a7a0xxyk10qx93j4rs3"; + version = "0.8.1"; + sha256 = "0qhxjgjmbs2gr43rzxhzr6hjygkjr7fiqka93vsfi13hpv6bw2p7"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ aeson base containers hspec QuickCheck text @@ -92226,33 +92339,6 @@ self: { }) {}; "ersatz" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, containers - , data-default, fail, lens, mtl, parsec, process, semigroups - , streams, temporary, transformers, unordered-containers - }: - mkDerivation { - pname = "ersatz"; - version = "0.4.12"; - sha256 = "0xdmp8yc22flb2p7bczb56k2z79kp4zs0y9x5430029whhz90bar"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array attoparsec base bytestring containers data-default lens mtl - process semigroups streams temporary transformers - unordered-containers - ]; - executableHaskellDepends = [ - array base containers fail lens mtl parsec semigroups - ]; - testHaskellDepends = [ array base ]; - description = "A monad for expressing SAT or QSAT problems using observable sharing"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "ersatz_0_4_13" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, containers , data-default, fail, lens, mtl, parsec, process, semigroups , streams, temporary, transformers, unordered-containers @@ -93190,10 +93276,8 @@ self: { }: mkDerivation { pname = "evdev"; - version = "2.1.0"; - sha256 = "1gzf9hpsi2dmcgsifq5z91ing9b5k56mm2hx9wbsa180pmq30lj3"; - revision = "1"; - editedCabalFile = "0c930gd1a9pwlr4p9r9d9nizr90g06l836rai5b83z5sa0s3p01n"; + version = "2.2.0"; + sha256 = "128i0rlxdskd63jjz887c0mjrrcm0v4xac8k2m0csglp7jap1cb7"; libraryHaskellDepends = [ base bytestring containers extra filepath-bytestring monad-loops rawfilepath time unix @@ -96500,6 +96584,27 @@ self: { broken = true; }) {}; + "faster-megaparsec" = callPackage + ({ mkDerivation, base, bytestring, cassava, containers, deepseq + , directory, megaparsec, mtl, QuickCheck, tasty-bench, temporary + , text + }: + mkDerivation { + pname = "faster-megaparsec"; + version = "0.1.2.0"; + sha256 = "0xrwh9jnbjq5i7iry0w3yz60qqi5qy46qq4fq31880rjm87qc68b"; + libraryHaskellDepends = [ base megaparsec mtl ]; + testHaskellDepends = [ + base containers megaparsec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base bytestring cassava containers deepseq directory megaparsec + QuickCheck tasty-bench temporary text + ]; + description = "Speed up Megaparsec parsing when parsing succeeds"; + license = lib.licenses.gpl3Only; + }) {}; + "fastirc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-show , containers, monadLib, network-fancy @@ -100216,7 +100321,7 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; - "flat_0_5_2" = callPackage + "flat_0_6" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, filepath, ghc-prim, hashable, list-t, mono-traversable , pretty, primitive, QuickCheck, quickcheck-text, tasty @@ -100225,8 +100330,8 @@ self: { }: mkDerivation { pname = "flat"; - version = "0.5.2"; - sha256 = "189jgx5zd1m3wgn2mal93ak1p6qp9mkaz38gkfzvgv6nwgywxxix"; + version = "0.6"; + sha256 = "11mg3m760vm3b33c39h5n79lpsh9s4rjlmsmn6xxlycv2ms42cm4"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist ghc-prim hashable list-t mono-traversable pretty primitive text unordered-containers @@ -102647,7 +102752,7 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_8_2_0" = callPackage + "fourmolu_0_9_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec @@ -102657,8 +102762,8 @@ self: { }: mkDerivation { pname = "fourmolu"; - version = "0.8.2.0"; - sha256 = "1wyfj3yfhp00pr0sjbkba8djjgp1pk8jabj48cps2nkgy5lqbyix"; + version = "0.9.0.0"; + sha256 = "0zq9fv5yszm7icirgwj8g4lhg21lg87fhz56sssjnfikzmkwyh1l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104422,8 +104527,8 @@ self: { pname = "ftp-client"; version = "0.5.1.4"; sha256 = "0c2xn2q24imrfgsx4zxzi24ciwkrly6n47lc5k5406j5b4znn5lf"; - revision = "2"; - editedCabalFile = "128c6lalfyjqsrycgk0773fwww3a914qd4w62vv3hx4vpmy75gq4"; + revision = "3"; + editedCabalFile = "1a7xya5c89lj4s73bd0cgr53id53xz4fnqzrizdibb6a90ml7g9r"; libraryHaskellDepends = [ attoparsec base bytestring connection containers exceptions network transformers @@ -108098,24 +108203,27 @@ self: { }) {}; "genvalidity-appendful" = callPackage - ({ mkDerivation, appendful, base, containers, criterion - , genvalidity, genvalidity-containers, genvalidity-criterion - , genvalidity-hspec, genvalidity-hspec-aeson, genvalidity-time - , genvalidity-uuid, hspec, mtl, pretty-show, QuickCheck, random - , time, uuid + ({ mkDerivation, appendful, autodocodec, autodocodec-yaml, base + , containers, criterion, genvalidity, genvalidity-containers + , genvalidity-criterion, genvalidity-sydtest + , genvalidity-sydtest-aeson, genvalidity-time, genvalidity-uuid + , mtl, pretty-show, QuickCheck, random, safe-coloured-text, sydtest + , sydtest-discover, time, uuid }: mkDerivation { pname = "genvalidity-appendful"; - version = "0.0.0.0"; - sha256 = "0sri0xdaqxpaapjspq4gipmvh7az3dilbzd4v5ihgcsjfk7kxmaj"; + version = "0.1.0.0"; + sha256 = "081a9m99mr1mvq9bysn3g0fq05f6zayb4401v6709jcw7szxfbwn"; libraryHaskellDepends = [ appendful base containers genvalidity genvalidity-containers genvalidity-time QuickCheck ]; testHaskellDepends = [ - appendful base containers genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec mtl pretty-show QuickCheck random time uuid + appendful autodocodec autodocodec-yaml base containers + genvalidity-sydtest genvalidity-sydtest-aeson genvalidity-uuid mtl + pretty-show QuickCheck random safe-coloured-text sydtest time uuid ]; + testToolDepends = [ sydtest-discover ]; benchmarkHaskellDepends = [ appendful base criterion genvalidity-criterion ]; @@ -109910,12 +110018,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-exactprint_1_6_0" = callPackage + "ghc-exactprint_1_6_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-exactprint"; - version = "1.6.0"; - sha256 = "1yj0vn42sysilikylabnncq2g005mnmpf8n7sn0a6lphpcv9gdcf"; + version = "1.6.1"; + sha256 = "1ihr3mffcm0z4plkgysiki5l225ayrxgjfjqx37ysqgp7vvnsr08"; isLibrary = true; isExecutable = true; description = "ExactPrint for GHC"; @@ -110140,7 +110248,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_2_4_20220729" = callPackage + "ghc-lib_9_2_5_20221107" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, time @@ -110148,8 +110256,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.2.4.20220729"; - sha256 = "16whiazjynzj6qw1rmadyrxkibvmyhfzxzw42cv0ya9ijzlplhpq"; + version = "9.2.5.20221107"; + sha256 = "0layv7zsjlah3dmr538g34pg7cwwiawg0xcihyjxdh2x5q5qi05s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110162,7 +110270,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib_9_4_2_20220822" = callPackage + "ghc-lib_9_4_3_20221104" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time @@ -110170,8 +110278,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "9.4.2.20220822"; - sha256 = "0ri29jyrs31ai4a1w3a9jwxc6xb1hqp64gxbwb5y7mbfyi5ray30"; + version = "9.4.3.20221104"; + sha256 = "0qvlf7i5lk7d4q8kaq4b783kvrswl9q5idlw3ggqhph910bgvcwn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110224,15 +110332,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_2_4_20220729" = callPackage + "ghc-lib-parser_9_2_5_20221107" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.4.20220729"; - sha256 = "0rlm6znxrhs3s9s6c7qblvl03lscydx3dridyp985i593jyan55s"; + version = "9.2.5.20221107"; + sha256 = "1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -110245,15 +110353,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser_9_4_2_20220822" = callPackage + "ghc-lib-parser_9_4_3_20221104" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.4.2.20220822"; - sha256 = "0irqp5v5vsmv4jmwizl0ag9v43bxfi14m2n977xzya27fdwzvc9y"; + version = "9.4.3.20221104"; + sha256 = "10j4vfpajr716bnipfr1rfc6r99gdfc3pjmp80lqdsfzv7xfbgj4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -118924,8 +119032,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.6.6.0"; - sha256 = "1pc89l3kirw7d8bzzbsivnf2mcfd15bk3kl1x2f7i0fdgk06apzy"; + version = "0.6.6.3"; + sha256 = "0rxkpxm7606lpiw4csixqfmd025f7rp6ivv86c6ximjlqzz1krhz"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving generic-random lens lens-aeson monad-logger mtl @@ -120232,10 +120340,8 @@ self: { }: mkDerivation { pname = "graphql-client"; - version = "1.1.1"; - sha256 = "1d00ib9c8ps8vv1qgrkjfzrjbgbsdnp1jiz7779bwm76j88vggb4"; - revision = "5"; - editedCabalFile = "0kbpsca7iybc1ra1fm04c8axmbd18czgn1rq93j0ak9979yw79gd"; + version = "1.2.0"; + sha256 = "1570gsfz3f2dlqpmmb00kr2hcjsfz9p4knfnwvjcm2lij7avcvnp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122342,24 +122448,25 @@ self: { }) {}; "h-raylib" = callPackage - ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXi + ({ mkDerivation, base, c, libGL, libX11, libXcursor, libXext, libXi , libXinerama, libXrandr }: mkDerivation { pname = "h-raylib"; - version = "4.5.0.2"; - sha256 = "0yxjr2y12fj2mhis8gy3wz0115nbiznx6llxapbylcw4zx9vnb8i"; + version = "4.5.0.3"; + sha256 = "05k7z23fkjdwlq379vcd9ahqch52hkwlpmy774xafrbh2wrfli3d"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ - c libGL libX11 libXcursor libXi libXinerama libXrandr + c libGL libX11 libXcursor libXext libXi libXinerama libXrandr ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; broken = true; }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXi; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr;}; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr;}; "h-reversi" = callPackage ({ mkDerivation, base, blank-canvas, containers, hspec, QuickCheck @@ -124182,15 +124289,16 @@ self: { "hadolint" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, colourista , containers, cryptonite, data-default, deepseq, directory - , email-validate, filepath, foldl, gitrev, hspec, HsYAML, HUnit - , ilist, language-docker, megaparsec, mtl, network-uri - , optparse-applicative, parallel, parsec, prettyprinter, semver - , ShellCheck, silently, spdx, split, text, time, timerep, void + , email-validate, filepath, foldl, gitrev, hspec, hspec-discover + , HsYAML, HUnit, ilist, language-docker, megaparsec, mtl + , network-uri, optparse-applicative, parallel, parsec + , prettyprinter, semver, ShellCheck, silently, spdx, split, text + , time, timerep, void }: mkDerivation { pname = "hadolint"; - version = "2.11.0"; - sha256 = "1k5xjy064q6v306kaqkglkwzk5qwnljs7x550rxjk6012d8allcm"; + version = "2.12.0"; + sha256 = "190ighmy5bg21b67n8msli8im6xp1z4bh3cjadfpr76mikxk25vl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124209,6 +124317,7 @@ self: { HUnit language-docker megaparsec optparse-applicative ShellCheck silently split text ]; + testToolDepends = [ hspec-discover ]; description = "Dockerfile Linter JavaScript API"; license = lib.licenses.gpl3Only; mainProgram = "hadolint"; @@ -125217,7 +125326,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "hal_1_0_0" = callPackage + "hal_1_0_0_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, conduit, conduit-extra, containers, exceptions , hashable, hedgehog, hspec, hspec-hedgehog, http-client @@ -125226,10 +125335,8 @@ self: { }: mkDerivation { pname = "hal"; - version = "1.0.0"; - sha256 = "0mfdxjlypb1sj2kcsqks6anh80xy1azcg9lvlpkgz7dgdpjfygaq"; - revision = "2"; - editedCabalFile = "0hc2b8bdsbd1q1j7d8l64d51q3apsmsfs1blzw0fg3cjzd4v2slc"; + version = "1.0.0.1"; + sha256 = "1gdd0nbwm6hma57nw1y1gd0cc6z9zhhmim6l5miql2j6dk909mdv"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive conduit conduit-extra containers exceptions hashable http-client http-types @@ -127013,20 +127120,20 @@ self: { }) {}; "harfbuzz-pure" = callPackage - ({ mkDerivation, base, bytestring, freetype2, harfbuzz, parallel - , text, utf8-light + ({ mkDerivation, base, bytestring, derive-storable, freetype2 + , harfbuzz, parallel, text, utf8-light }: mkDerivation { pname = "harfbuzz-pure"; - version = "0.1.0.0"; - sha256 = "1djgq14d62zh2rhs10i5l6b78kmyvd3r6qghd36vhykza4lg2div"; + version = "1.0.0.0"; + sha256 = "1bydw57ab1qlicrs6cav3vk0jzqkvhnwb8c0k7ba48fmjyihi5fp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring freetype2 text utf8-light + base bytestring derive-storable freetype2 text utf8-light ]; libraryPkgconfigDepends = [ harfbuzz ]; - executableHaskellDepends = [ base bytestring parallel ]; + executableHaskellDepends = [ base bytestring parallel text ]; description = "Pure-functional Harfbuzz language bindings"; license = lib.licenses.mit; mainProgram = "shape-text"; @@ -137078,12 +137185,27 @@ self: { pname = "hex-text"; version = "0.1.0.6"; sha256 = "1a5ccvbj7asbx92f4309qfwwih8ffnfi5kkahdn6dp444xa374r7"; + revision = "2"; + editedCabalFile = "00bwakiri9vbn05zi7alwhl5rdg13ls3pydcrgc0q4v8banrp868"; libraryHaskellDepends = [ base base16-bytestring bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring text ]; description = "ByteString-Text hexidecimal conversions"; license = lib.licenses.mit; }) {}; + "hex-text_0_1_0_7" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, text }: + mkDerivation { + pname = "hex-text"; + version = "0.1.0.7"; + sha256 = "1xyyr6570dbp6mgarz8v56s9kg4pfzk1dc10nw0gg51j6xl1c2zn"; + libraryHaskellDepends = [ base base16-bytestring bytestring text ]; + testHaskellDepends = [ base base16-bytestring bytestring text ]; + description = "ByteString-Text hexidecimal conversions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hexchat" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -145396,10 +145518,8 @@ self: { }: mkDerivation { pname = "hpc-lcov"; - version = "1.0.1"; - sha256 = "01ws5y2vavgm7151dcabw3jwny1prrnzn5b04q76m5gc6a36wivl"; - revision = "4"; - editedCabalFile = "0mds8q19pqxgrmyzgzrc01zb6wf7gx5cjl8brvw7ljkyrb2n2lya"; + version = "1.1.0"; + sha256 = "009z1i0ddjx7sazybirrpw99675p1fyl84ykg4dyypa7rz81vv3z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hpc ]; @@ -161030,25 +161150,25 @@ self: { "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default-class, deepseq, directory, exceptions, filepath - , ieee754, inline-c, mtl, pretty, primitive, process + , heredoc, ieee754, inline-c, mtl, pretty, primitive, process , quickcheck-assertions, R, reflection, setenv, silently - , singletons, strict, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text - , th-lift, th-orphans, transformers, unix, vector + , singletons, singletons-th, strict, tasty, tasty-expected-failure + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , temporary, text, th-lift, th-orphans, transformers, unix, vector }: mkDerivation { pname = "inline-r"; - version = "0.10.5"; - sha256 = "1jaj3p4vj9g1pk4rfs1sywbq04w24g137yvl6g6mlsxyzd4mldwh"; + version = "1.0.0"; + sha256 = "0b7xsfglhb9mjac79ch07fd426bkdg22nwdg50j3jj906bi65jba"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq - exceptions inline-c mtl pretty primitive process reflection setenv - singletons template-haskell text th-lift th-orphans transformers - unix vector + exceptions heredoc inline-c mtl pretty primitive process reflection + setenv singletons singletons-th template-haskell temporary text + th-lift th-orphans transformers unix vector ]; libraryPkgconfigDepends = [ R ]; testHaskellDepends = [ - base bytestring directory filepath ieee754 mtl process + base bytestring directory filepath heredoc ieee754 mtl process quickcheck-assertions silently singletons strict tasty tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck template-haskell temporary text unix vector @@ -172967,15 +173087,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "language-docker_11_0_0" = callPackage + "language-docker_12_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec , prettyprinter, QuickCheck, split, text, time }: mkDerivation { pname = "language-docker"; - version = "11.0.0"; - sha256 = "1j8aib6pq7ghmsi3l2p554l8gnapi0jd3qsi8vhdn2mgvw2n1948"; + version = "12.0.0"; + sha256 = "1slrq343rcg9shmqxxy8kzk911071x31q61q75dnldnm3x27j6by"; libraryHaskellDepends = [ base bytestring containers data-default data-default-class megaparsec prettyprinter split text time @@ -174507,8 +174627,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.0.2"; - sha256 = "1wh0an9g3hzpmdp2jayag7dknajivl07h273ar1qplrfd1js5fd6"; + version = "3.0.3"; + sha256 = "0j5j4x94r7ha7amv0cggs7n7n9vyx1ga5kwdr8mcddc7karz18cg"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables hedis @@ -178756,8 +178876,8 @@ self: { ({ mkDerivation, array, base, constraints }: mkDerivation { pname = "linear-smc"; - version = "1.0.0"; - sha256 = "13b1gvpnpxvkswigd9cdq289m6d68vqddnq95p0i65vr2hhard8i"; + version = "1.0.1"; + sha256 = "0xgrsjqfxzz1qbphv9r0kh4agg6cjz712isk5c16zywldw5hrx9q"; libraryHaskellDepends = [ base constraints ]; testHaskellDepends = [ array base constraints ]; description = "Build SMC morphisms using linear types"; @@ -185997,8 +186117,8 @@ self: { ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.10"; - sha256 = "1p1n21hzmkk7czwnmyl4hm36jvn0m05wid3zdwiqhbxq3mw46sxa"; + version = "0.2.11"; + sha256 = "1bg0az68jzxkb54rx7zf7bbkdkp5h0aqxyy78d8caaimc5ch2mbv"; libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = lib.licenses.mit; @@ -190372,8 +190492,8 @@ self: { }: mkDerivation { pname = "migrant-core"; - version = "0.1.0.2"; - sha256 = "1na0vcrmw3vy6v9qxxpprhga9ja7izwbp856pdpqiq98p4h8xmiw"; + version = "0.1.0.3"; + sha256 = "15g7w2bpzhpp0gann0s8sj5ha315jf3bwlhkapfbrbjmswph0fgf"; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck text @@ -190391,8 +190511,8 @@ self: { }: mkDerivation { pname = "migrant-hdbc"; - version = "0.1.0.2"; - sha256 = "084vqb1z0ipxn07nswlcw0bbh0bfywm7hyvakb75xg8rv5kfak15"; + version = "0.1.0.3"; + sha256 = "181n17jxwii3c64crzrpxry9fbpmclpanf6sqbb3rc9vdpm7df0g"; libraryHaskellDepends = [ base HDBC migrant-core text ]; testHaskellDepends = [ base HDBC HDBC-sqlite3 HUnit migrant-core process QuickCheck random @@ -190410,8 +190530,8 @@ self: { }: mkDerivation { pname = "migrant-postgresql-simple"; - version = "0.1.0.2"; - sha256 = "1x1gsf0vp82n6dmyiamj1cvs9fww7j1ffh6d9qr075z5sj8zbhzx"; + version = "0.1.0.3"; + sha256 = "096lj9ibminyfb09ciab20q014mqhwahqh3prc530lhv5arin1ml"; libraryHaskellDepends = [ base migrant-core postgresql-simple text ]; @@ -190430,8 +190550,8 @@ self: { }: mkDerivation { pname = "migrant-sqlite-simple"; - version = "0.1.0.2"; - sha256 = "140fchiid0kjp1cdw114w497h0fsrskn9195bkjv44sdmq2l8car"; + version = "0.1.0.3"; + sha256 = "0gcji3kmdndn77kg74bxki32fwrvzafjv4svpxj31advprn6jdgx"; libraryHaskellDepends = [ base migrant-core sqlite-simple text ]; testHaskellDepends = [ base HUnit migrant-core QuickCheck sqlite-simple tasty tasty-hunit @@ -192408,8 +192528,8 @@ self: { ({ mkDerivation, base, doctest, typelits-witnesses }: mkDerivation { pname = "modular-arithmetic"; - version = "2.0.0.1"; - sha256 = "132cxgrw6lsdkpqi69v1f9jgl5icslwi5qclv4rc03hn0mcnl2sz"; + version = "2.0.0.2"; + sha256 = "1bbn3pwvpl9v7a8gkxx83w2s8mk2q9gin7yvkkr97f64rdf8lnrq"; libraryHaskellDepends = [ base typelits-witnesses ]; testHaskellDepends = [ base doctest typelits-witnesses ]; description = "A type for integers modulo some constant"; @@ -192726,8 +192846,8 @@ self: { }: mkDerivation { pname = "monad-bayes"; - version = "1.0.0"; - sha256 = "1s5niiss16a5lgw2jhda3c34r1ylcjb5k14bk0n7p7l117xpxsza"; + version = "1.1.0"; + sha256 = "0zpgmai2wh8iqdg8ds9y1928fsila80dhpidgz4hp0jkxkk988gh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195448,8 +195568,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql"; - version = "0.25.0"; - sha256 = "08vi8g73c55ky6qrgkq57h1zbpkavv0ajfd16i86s6zdaxpk3fhm"; + version = "0.26.0"; + sha256 = "1x1hg60l7zbdb7kg2gx93zxknd9f7bbdvr6r9hcy8w86h8aplilm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195478,8 +195598,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-app"; - version = "0.25.0"; - sha256 = "09skrg2pasx3hdm13sq9ajka5yh5wsc1wc8rphc9g6pa7hpnnsxh"; + version = "0.26.0"; + sha256 = "1dq0hnm1bsy43vbrs2rm5df5j9yy55azj420jf8fs71676xni7hn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec @@ -195529,8 +195649,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.25.0"; - sha256 = "01brdkc2vqipif5942hrzli45agb7rk8wlhx2m1j9zhcxhsbhlwf"; + version = "0.26.0"; + sha256 = "0n8x888qhamlb6pkk4sa864mb3y7h261s1f83waqg0d7qdwcp5nx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers file-embed modern-uri @@ -195560,8 +195680,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen"; - version = "0.25.0"; - sha256 = "0hisqds2fn7m53hddvxw4glgwghqnx3qg0hhdc6c4zjafyfkbckf"; + version = "0.26.0"; + sha256 = "1mdhifqqj44dr9j2z4nh0m8n4836mv8cav9qn155b3nairfh3w3a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -195590,8 +195710,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-code-gen-utils"; - version = "0.25.0"; - sha256 = "1xnszpmzw0jl9dshzqs5vr9kjnm9sbi0jbgpjb44s9bd4hdgyxq5"; + version = "0.26.0"; + sha256 = "0nhv20vn8v73zri9ws3rwyi9xyshp6pm7v610rrwfa43wyxlpq5g"; libraryHaskellDepends = [ base bytestring containers morpheus-graphql-core prettyprinter relude template-haskell text unordered-containers @@ -195609,8 +195729,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.25.0"; - sha256 = "07ay9vzhlxgsv9lw3b22c59r00b6f0w2c90qn14a349lkjhl1wfa"; + version = "0.26.0"; + sha256 = "0cj78h29ryalxnx4hzpl5kywqdcvjxvxqlc6axibb1cmajn4kbqm"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers hashable megaparsec mtl relude @@ -195638,8 +195758,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-server"; - version = "0.25.0"; - sha256 = "02lhrvz00l2486n7nihs8ka92hxa3idzlzx10fn142kqli65bwwi"; + version = "0.26.0"; + sha256 = "1aca18d60ja6awgsvwjjbikqhvspn3wans1dvh57g37ma1p1v331"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers morpheus-graphql-app @@ -195664,8 +195784,8 @@ self: { }: mkDerivation { pname = "morpheus-graphql-subscriptions"; - version = "0.25.0"; - sha256 = "063gszwrjlszqg973axyig9alrix0fj7j4n2c01wdaxyjmxmzdjx"; + version = "0.26.0"; + sha256 = "1kmd37w3kp2mdhz64fwlyl9v7p10x3p6fbzw535kipic89y9pcx2"; libraryHaskellDepends = [ aeson base bytestring morpheus-graphql-app morpheus-graphql-core mtl relude text transformers unliftio-core unordered-containers @@ -195692,14 +195812,14 @@ self: { license = lib.licenses.mit; }) {}; - "morpheus-graphql-tests_0_25_0" = callPackage + "morpheus-graphql-tests_0_26_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers }: mkDerivation { pname = "morpheus-graphql-tests"; - version = "0.25.0"; - sha256 = "1gnysygk4rvcyv85f86yhcxl0rlq5hk5avanyv428fdirsjkkn5q"; + version = "0.26.0"; + sha256 = "0dyza53pp9s16y8mlpm63b9ds396lqf8wsj2qaymyy18iakcfb9m"; libraryHaskellDepends = [ aeson base bytestring directory relude tasty tasty-hunit text unordered-containers @@ -196513,8 +196633,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "mr-env"; - version = "0.1.0.4"; - sha256 = "05f89d0lxmi8w7hgdlqrgxh2abnjghcgjhzmra41p28h26adqnfm"; + version = "0.1.0.5"; + sha256 = "0hy9hqy3ijrg4l85lj6g5y48cj812y7i6nkb4q8cq2yshdchj6pi"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; @@ -199448,26 +199568,6 @@ self: { }) {}; "mysql-simple" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, containers, hspec, mysql, old-locale, pcre-light - , text, time, vector - }: - mkDerivation { - pname = "mysql-simple"; - version = "0.4.8.1"; - sha256 = "18w6mp7s1dmvwzqdgdzywhp5li3h4kisrhgxllwi578nddwg2yx3"; - libraryHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - containers mysql old-locale pcre-light text time vector - ]; - testHaskellDepends = [ - base blaze-builder bytestring hspec mysql text time - ]; - description = "A mid-level MySQL client library"; - license = lib.licenses.bsd3; - }) {}; - - "mysql-simple_0_4_9" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, containers, hspec, mysql, old-locale, pcre-light , text, time, vector @@ -199485,7 +199585,6 @@ self: { ]; description = "A mid-level MySQL client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mysql-simple-quasi" = callPackage @@ -206574,6 +206673,46 @@ self: { license = lib.licenses.asl20; }) {}; + "nvim-hs_2_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell + , template-haskell-compat-v0208, text, time, time-locale-compat + , transformers, transformers-base, typed-process, unliftio + , unliftio-core, utf8-string, vector, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "2.3.0.0"; + sha256 = "0jc0wzxfkah115j0y4pa4hvr4wziba4q319x5ddgb9jbc52rqh7r"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell template-haskell-compat-v0208 text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector void + ]; + testHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell + template-haskell-compat-v0208 text time time-locale-compat + transformers transformers-base typed-process unliftio unliftio-core + utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell plugin backend for neovim"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -207563,8 +207702,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.6.1.0"; - sha256 = "0hhjndh4q2a9694rhylrqk2a8bzy8x9i5k4is2w7709sifydip1y"; + version = "0.7.0.0"; + sha256 = "0cc1psif3s6qmina5sx49clvpg54b6sapcvq4ax3r0afsp4hdl3m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210745,17 +210884,6 @@ self: { }) {}; "ordered-containers" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "ordered-containers"; - version = "0.2.2"; - sha256 = "1j92dm36s0cfhc7s4k3dk36ibkvr6w1nhaq6q1m5vkbh1qrwfnn7"; - libraryHaskellDepends = [ base containers ]; - description = "Set- and Map-like types that remember the order elements were inserted"; - license = lib.licenses.bsd3; - }) {}; - - "ordered-containers_0_2_3" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "ordered-containers"; @@ -210764,7 +210892,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Set- and Map-like types that remember the order elements were inserted"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ordering-util" = callPackage @@ -212289,8 +212416,8 @@ self: { pname = "palette"; version = "0.3.0.2"; sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; - revision = "4"; - editedCabalFile = "07yjz9hsmfm5jh05i4nqc6iax61ssr97475l7pf3bbdp8bam39wl"; + revision = "5"; + editedCabalFile = "1h5vs204qkq0m9ks5sf7f300drpkinkhinvmnijq8x0mbjl8hsg4"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -219169,8 +219296,8 @@ self: { pname = "phatsort"; version = "0.5.0.1"; sha256 = "14czx4s3ywfcxbw8lr60i3cdk62rcfr7m1v98mx3qm1gjinll5js"; - revision = "1"; - editedCabalFile = "06s8xg07za1d23wai8pb7gvbcri2vmbv0jks7as8d8mf82giqvz8"; + revision = "2"; + editedCabalFile = "087vq0cfrvqgqrph5kkpyrvyfc72n9jh7bip68s30w5y4v55a821"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -225972,8 +226099,8 @@ self: { }: mkDerivation { pname = "postgresql-migration"; - version = "0.2.1.4"; - sha256 = "0p8rggalgijw02p7m77x443md5dg1kjvvm06v980cchsj148c80s"; + version = "0.2.1.6"; + sha256 = "0zx6pa9s8k3gq1sgn8pj9xwdlj0wlx49d1mxgmd9s2zk9flfzybf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230087,8 +230214,8 @@ self: { }: mkDerivation { pname = "project-m36"; - version = "0.9.5"; - sha256 = "01gd1hi7x515q1y2nz3zsx3481rb13f30i6xccyzm4fjn7p08mv7"; + version = "0.9.6"; + sha256 = "067z934phddvi7r4kp3b1ykfz62vak395j9wlwm36m9rn526ih8g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230125,7 +230252,7 @@ self: { modern-uri MonadRandom mtl network optparse-applicative parallel parser-combinators prettyprinter random scientific semigroups stm stm-containers temporary text time transformers - unordered-containers uuid vector websockets winery + unordered-containers uuid vector wai warp websockets winery ]; benchmarkHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring @@ -234372,19 +234499,19 @@ self: { }) {}; "quickcheck-lockstep" = callPackage - ({ mkDerivation, base, containers, directory, filepath, mtl - , QuickCheck, quickcheck-dynamic, tasty, tasty-hunit + ({ mkDerivation, base, constraints, containers, directory, filepath + , mtl, QuickCheck, quickcheck-dynamic, tasty, tasty-hunit , tasty-quickcheck, temporary }: mkDerivation { pname = "quickcheck-lockstep"; - version = "0.1.0"; - sha256 = "0i0sqd5fky5d8imlrqazmr7cpdm71mdgv7sagyx9f1bb38p4yr9g"; + version = "0.2.0"; + sha256 = "1vc0ry2qp4c99pql6mgb4csffsjs9qgwciz58g68wbrjqp7rgm2w"; libraryHaskellDepends = [ - base containers mtl QuickCheck quickcheck-dynamic + base constraints containers mtl QuickCheck quickcheck-dynamic ]; testHaskellDepends = [ - base containers directory filepath mtl QuickCheck + base constraints containers directory filepath mtl QuickCheck quickcheck-dynamic tasty tasty-hunit tasty-quickcheck temporary ]; description = "Library for lockstep-style testing with 'quickcheck-dynamic'"; @@ -244030,8 +244157,8 @@ self: { }: mkDerivation { pname = "ret"; - version = "0.1.5.1"; - sha256 = "0jac5hidynwqnfik8h2fkf45dm1cdf6ql6zxwyap14m7z3jbv48n"; + version = "0.1.5.2"; + sha256 = "1lsqjqib4nvxacsjlr4207vwwxdd86wxxjvxw4vqra6a5clj6g08"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -245323,8 +245450,8 @@ self: { }: mkDerivation { pname = "rio-prettyprint"; - version = "0.1.1.0"; - sha256 = "1h092l46pfm6k3n0vb6c67gb64kahzc97qv45rhvp0cq2y5bqykf"; + version = "0.1.2.0"; + sha256 = "0xql9rjd0b8vyfllb9h8j7nxbrnrvz9kkclzlb3wln10l9pi5v03"; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl path rio text @@ -255515,8 +255642,8 @@ self: { }: mkDerivation { pname = "servant-polysemy"; - version = "0.1.3"; - sha256 = "132yf6fp0hl6k3859sywkfzsca8xsaqd3a4ca4vdqqjrllk0m88i"; + version = "0.1.4"; + sha256 = "07rma3yijvp9sd0lnnx77in0h4a8mm955v65hzh5mh0j91k406n2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -257876,6 +258003,8 @@ self: { pname = "shake-cabal"; version = "0.2.2.2"; sha256 = "1z1l4mah7nmpa6ycx9f5ynr9rn24irs1w44nq1j3ck25b408g460"; + revision = "1"; + editedCabalFile = "0r2b00d0r2i73sw4h5sksdck70924k0485ayai22n3ybdj8h6xwx"; libraryHaskellDepends = [ base binary Cabal composition-prelude deepseq directory filepath hashable shake @@ -262651,22 +262780,6 @@ self: { }) {}; "slist" = callPackage - ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec - , hspec-hedgehog - }: - mkDerivation { - pname = "slist"; - version = "0.2.0.1"; - sha256 = "1b7b869gg3bkhx8ija601gwx9521mqy5sxkizc7ss73pqj4bhv60"; - libraryHaskellDepends = [ base containers ]; - testHaskellDepends = [ - base doctest Glob hedgehog hspec hspec-hedgehog - ]; - description = "Sized list"; - license = lib.licenses.mpl20; - }) {}; - - "slist_0_2_1_0" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hedgehog, hspec , hspec-hedgehog }: @@ -262680,7 +262793,6 @@ self: { ]; description = "Sized list"; license = lib.licenses.mpl20; - hydraPlatforms = lib.platforms.none; }) {}; "sloane" = callPackage @@ -266130,16 +266242,15 @@ self: { "souffle-haskell" = callPackage ({ mkDerivation, array, base, bytestring, criterion, deepseq , directory, filepath, hedgehog, hspec, hspec-hedgehog, mtl - , process, profunctors, temporary, text, text-short - , type-errors-pretty, vector + , process, profunctors, temporary, text, text-short, vector }: mkDerivation { pname = "souffle-haskell"; - version = "3.5.0"; - sha256 = "1s6398wfm6wly72b7kb7l13lskc1v4iivzz9d0vbwr8jv83grjbr"; + version = "3.5.1"; + sha256 = "0vxwbs0nc7rvlcfb62nx8fa5kghwgxakg4djqmsrcq2qdvxvifbh"; libraryHaskellDepends = [ array base bytestring deepseq directory filepath mtl process - profunctors temporary text text-short type-errors-pretty vector + profunctors temporary text text-short vector ]; testHaskellDepends = [ array base directory hedgehog hspec hspec-hedgehog profunctors @@ -268101,6 +268212,27 @@ self: { broken = true; }) {inherit (pkgs) sqlite;}; + "sqlite-easy" = callPackage + ({ mkDerivation, base, bytestring, direct-sqlite, hspec + , hspec-discover, migrant-core, resource-pool, text + }: + mkDerivation { + pname = "sqlite-easy"; + version = "0.1.0.0"; + sha256 = "0i971dvfsdxpm6chxbc53flcw8gyk45nsp8pm0q2avl8p9sab05f"; + revision = "1"; + editedCabalFile = "0b3sa10mk3c2gjpsgdnylb3iqpwycfnhpscqhi68s0vfvq2ph9w8"; + libraryHaskellDepends = [ + base bytestring direct-sqlite migrant-core resource-pool text + ]; + testHaskellDepends = [ + base direct-sqlite hspec hspec-discover text + ]; + testToolDepends = [ hspec-discover ]; + description = "A primitive yet easy to use sqlite library"; + license = lib.licenses.bsd3; + }) {}; + "sqlite-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only @@ -269723,8 +269855,8 @@ self: { }: mkDerivation { pname = "stackctl"; - version = "1.1.0.1"; - sha256 = "1rhwgc6qgip3p8qvyjahpk7xbv583p35rxba2x02ig7hbx3724y7"; + version = "1.1.0.3"; + sha256 = "0vvhvyvc6dz8l0df3f14qiy5851n2mv45gvjyz1cq94f44higfjw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -275257,6 +275389,29 @@ self: { broken = true; }) {}; + "supply-chain" = callPackage + ({ mkDerivation, base, supply-chain-core }: + mkDerivation { + pname = "supply-chain"; + version = "0.0.0.0"; + sha256 = "12rdx593ivps3khxpvq0r1kc99jhzvc0qfkdxa7jdy0qn22fi3dx"; + libraryHaskellDepends = [ base supply-chain-core ]; + description = "Composable request-response pipelines"; + license = lib.licenses.asl20; + }) {}; + + "supply-chain-core" = callPackage + ({ mkDerivation, base, tasty, tasty-hedgehog, tasty-hunit }: + mkDerivation { + pname = "supply-chain-core"; + version = "0.0.0.0"; + sha256 = "17ih0pvfk0xzr30q9094gf8ry8pvnannr92hvk86z7j514nv6q9h"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hedgehog tasty-hunit ]; + description = "Composable request-response pipelines"; + license = lib.licenses.asl20; + }) {}; + "surjective" = callPackage ({ mkDerivation, base, lens, mtl, template-haskell }: mkDerivation { @@ -275464,8 +275619,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.3.0.0"; - sha256 = "0ybnda16klwcajhhmzpiajdl39rkk52zb41k6b0qvd21dxmv2qji"; + version = "2.5.0.1"; + sha256 = "0iwrs53n6f4l2fqybamghbk5ha1w8vspiha6cnjx49hzljsjz738"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280327,18 +280482,19 @@ self: { }) {}; "tasty-sugar" = callPackage - ({ mkDerivation, base, directory, filemanip, filepath, hedgehog - , kvitable, logict, microlens, mtl, optparse-applicative - , pretty-show, prettyprinter, raw-strings-qq, tasty, tasty-hedgehog - , tasty-hunit, text + ({ mkDerivation, base, containers, directory, filemanip, filepath + , hedgehog, kvitable, logict, microlens, mtl, optparse-applicative + , parallel, pretty-show, prettyprinter, raw-strings-qq, tasty + , tasty-hedgehog, tasty-hunit, text }: mkDerivation { pname = "tasty-sugar"; - version = "1.3.0.2"; - sha256 = "1hh2a3bzk0x0l4wqar7qb8kj9kwjlw1j5z7jxsia7a0p25wy8w8a"; + version = "2.0.0.1"; + sha256 = "0rgq5k9vv72c5826acpfscjfszvyi5bms5wjbw7bs0izimqw7b1j"; libraryHaskellDepends = [ - base directory filemanip filepath kvitable logict microlens mtl - optparse-applicative prettyprinter tasty text + base containers directory filemanip filepath kvitable logict + microlens mtl optparse-applicative parallel prettyprinter tasty + text ]; testHaskellDepends = [ base filepath hedgehog logict pretty-show prettyprinter @@ -283382,12 +283538,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "text-ansi_0_2_0" = callPackage + "text-ansi_0_2_1" = callPackage ({ mkDerivation, base, text, text-builder }: mkDerivation { pname = "text-ansi"; - version = "0.2.0"; - sha256 = "15sraxbiwwx49nz4kxhh2b45q222pcxzgm85rmaskpi7pswwj0b2"; + version = "0.2.1"; + sha256 = "1s0ad0nap9z0pzwl3nm2vglkz148qv120bngwy08bqb6vbs8w90p"; libraryHaskellDepends = [ base text text-builder ]; description = "Text styling for ANSI terminals"; license = lib.licenses.bsd3; @@ -283529,12 +283685,14 @@ self: { }) {}; "text-compression" = callPackage - ({ mkDerivation, base, containers, massiv, mtl }: + ({ mkDerivation, base, bytestring, containers, massiv, mtl, text }: mkDerivation { pname = "text-compression"; - version = "0.1.0.4"; - sha256 = "15bkgmlav4aybsgh7wg261fkhqg7phsc91sp1w26f9m2wb278xby"; - libraryHaskellDepends = [ base containers massiv mtl ]; + version = "0.1.0.7"; + sha256 = "0sxzcdfx2v0870w130vkw6iyg5w0k8vvkz7fj3b50kr4wl9wypb4"; + libraryHaskellDepends = [ + base bytestring containers massiv mtl text + ]; description = "A text compression library"; license = lib.licenses.bsd3; }) {}; @@ -285244,6 +285402,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "th-test-utils_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-golden, tasty-hunit + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "th-test-utils"; + version = "1.2.0"; + sha256 = "0p5j5mgjqwvkw0rcxlfkcflyqdz972ls70lprn38yjb32v3l8ncf"; + libraryHaskellDepends = [ + base template-haskell th-orphans transformers + ]; + testHaskellDepends = [ + base bytestring tasty tasty-golden tasty-hunit template-haskell + th-orphans transformers + ]; + description = "Utility functions for testing Template Haskell code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "th-to-exp" = callPackage ({ mkDerivation, base, hspec, template-haskell }: mkDerivation { @@ -286209,8 +286387,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.2.0"; - sha256 = "1bw10jahy0s9ai6ryfdx58jzjib146x7kzqkg65z71brvm0cliza"; + version = "0.1.2.1"; + sha256 = "1crs90dy9ljprxb19x3zj92579njjw6ki5jnnjj8afrharim9ppj"; libraryHaskellDepends = [ base composition-prelude megaparsec text ]; @@ -287248,14 +287426,27 @@ self: { pname = "timer-wheel"; version = "0.3.0"; sha256 = "16v663mcsj0h17x4jriq50dps3m3f8wqcsm19kl48vrs7f4mp07s"; - revision = "2"; - editedCabalFile = "0kfckbmcf9c8538i38r40agrc31mgk771hfnm54sgslnam1idiym"; + revision = "3"; + editedCabalFile = "1lgavl752g968ki042dxha8d28dm8zfs8mzm5zl8xk4p0wi1iwdv"; libraryHaskellDepends = [ atomic-primops base psqueues vector ]; testHaskellDepends = [ base ]; description = "A timer wheel"; license = lib.licenses.bsd3; }) {}; + "timer-wheel_0_4_0_1" = callPackage + ({ mkDerivation, array, atomic-primops, base, ki, psqueues }: + mkDerivation { + pname = "timer-wheel"; + version = "0.4.0.1"; + sha256 = "0h8g9mgp7hcmksvgwwx2n1p9mavdsykqlavpdms7xbh0kgsb445z"; + libraryHaskellDepends = [ array atomic-primops base ki psqueues ]; + testHaskellDepends = [ base ]; + description = "A timer wheel"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "timerep" = callPackage ({ mkDerivation, attoparsec, base, monoid-subclasses, QuickCheck , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -293031,8 +293222,8 @@ self: { }: mkDerivation { pname = "twitchapi"; - version = "0.0.2"; - sha256 = "0lw7lr41lnm0jz3ig3y7y23348sp7mvpnihz90nh8j5iv74j7z12"; + version = "0.0.3"; + sha256 = "1wbkix4cmkzgg5mz6d721107nra00dr00nhigq55wkzhnpf39lbz"; libraryHaskellDepends = [ aeson base bytestring hoauth2 http-client text time timerep uri-bytestring @@ -307635,8 +307826,8 @@ self: { }: mkDerivation { pname = "welford-online-mean-variance"; - version = "0.1.0.1"; - sha256 = "1zzahm5d47rx1zx70i24mj6slkddwpa6hwyplda36x9xpkpjzr51"; + version = "0.1.0.2"; + sha256 = "041z3vgbnv2q6a9w80rjws3y0lwb56z1ws2ic8pyx79dvjb0y55q"; libraryHaskellDepends = [ base cereal deepseq vector ]; testHaskellDepends = [ base cereal deepseq QuickCheck tasty tasty-discover @@ -312271,6 +312462,8 @@ self: { pname = "xmonad"; version = "0.17.1"; sha256 = "1apqwyqmc51gamfgsvlanzqqig9qvjss89ibcamhnha1gs1k4jl8"; + revision = "2"; + editedCabalFile = "1rgwrnyb7kijzl2mqm8ks2nydh37q5vkbg4400rg9n6x13w2r9b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -312322,6 +312515,8 @@ self: { pname = "xmonad-contrib"; version = "0.17.1"; sha256 = "0lwj8xkyaw6h0rv3lz2jdqrwzz7yghfmnhpndygkb3wgyhvq6dxb"; + revision = "1"; + editedCabalFile = "0dc9nbn0kaw98rgpi1rq8np601zjhdr1y0ydg6yb82wwaqawql6z"; libraryHaskellDepends = [ base bytestring containers deepseq directory filepath mtl process random time unix utf8-string X11 X11-xft xmonad From 6e4f74f19b05a348b39f2c932cbcf814bb97d756 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 11 Nov 2022 19:31:18 +0100 Subject: [PATCH 06/55] haskellPackages.h-raylib: remove broken flag Closes #197407. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d061f89c2770..fd91f3796fe1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2355,7 +2355,6 @@ broken-packages: - hquantlib - hquery - hR - - h-raylib - hreq-core - h-reversi - hricket diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b46fbdc286d5..b1f88b5ea529 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -122461,8 +122461,6 @@ self: { ]; description = "Raylib bindings for Haskell"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; From 28609af5c71fad9cb8b3351957bf71ce7f7bbbed Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 13 Nov 2022 23:37:47 +0100 Subject: [PATCH 07/55] android-tools: 33.0.3 -> 33.0.3p1 --- .../android-tools-kernel-headers-6.0.diff | 82 ------------------- pkgs/tools/misc/android-tools/default.nix | 31 ++----- 2 files changed, 9 insertions(+), 104 deletions(-) delete mode 100644 pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff diff --git a/pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff b/pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff deleted file mode 100644 index 38c0c9f39491..000000000000 --- a/pkgs/tools/misc/android-tools/android-tools-kernel-headers-6.0.diff +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/vendor/adb/client/usb_linux.cpp b/vendor/adb/client/usb_linux.cpp -index 25a50bd..0d09c47 100644 ---- a/vendor/adb/client/usb_linux.cpp -+++ b/vendor/adb/client/usb_linux.cpp -@@ -59,8 +59,15 @@ using namespace std::literals; - #define DBGX(x...) - - struct usb_handle { -+ usb_handle() : urb_in(0), urb_out(0) { -+ this->urb_in = new usbdevfs_urb; -+ this->urb_out = new usbdevfs_urb; -+ } -+ - ~usb_handle() { - if (fd != -1) unix_close(fd); -+ delete urb_in; -+ delete urb_out; - } - - std::string path; -@@ -72,8 +79,8 @@ struct usb_handle { - unsigned zero_mask; - unsigned writeable = 1; - -- usbdevfs_urb urb_in; -- usbdevfs_urb urb_out; -+ usbdevfs_urb *urb_in; -+ usbdevfs_urb *urb_out; - - bool urb_in_busy = false; - bool urb_out_busy = false; -@@ -304,7 +311,7 @@ static int usb_bulk_write(usb_handle* h, const void* data, int len) { - std::unique_lock lock(h->mutex); - D("++ usb_bulk_write ++"); - -- usbdevfs_urb* urb = &h->urb_out; -+ usbdevfs_urb* urb = h->urb_out; - memset(urb, 0, sizeof(*urb)); - urb->type = USBDEVFS_URB_TYPE_BULK; - urb->endpoint = h->ep_out; -@@ -343,7 +350,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { - std::unique_lock lock(h->mutex); - D("++ usb_bulk_read ++"); - -- usbdevfs_urb* urb = &h->urb_in; -+ usbdevfs_urb* urb = h->urb_in; - memset(urb, 0, sizeof(*urb)); - urb->type = USBDEVFS_URB_TYPE_BULK; - urb->endpoint = h->ep_in; -@@ -388,7 +395,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { - } - D("[ urb @%p status = %d, actual = %d ]", out, out->status, out->actual_length); - -- if (out == &h->urb_in) { -+ if (out == h->urb_in) { - D("[ reap urb - IN complete ]"); - h->urb_in_busy = false; - if (urb->status != 0) { -@@ -397,7 +404,7 @@ static int usb_bulk_read(usb_handle* h, void* data, int len) { - } - return urb->actual_length; - } -- if (out == &h->urb_out) { -+ if (out == h->urb_out) { - D("[ reap urb - OUT compelete ]"); - h->urb_out_busy = false; - h->cv.notify_all(); -@@ -501,10 +508,10 @@ void usb_kick(usb_handle* h) { - ** but this ensures that a reader blocked on REAPURB - ** will get unblocked - */ -- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_in); -- ioctl(h->fd, USBDEVFS_DISCARDURB, &h->urb_out); -- h->urb_in.status = -ENODEV; -- h->urb_out.status = -ENODEV; -+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_in); -+ ioctl(h->fd, USBDEVFS_DISCARDURB, h->urb_out); -+ h->urb_in->status = -ENODEV; -+ h->urb_out->status = -ENODEV; - h->urb_in_busy = false; - h->urb_out_busy = false; - h->cv.notify_all(); diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index bb56d4fa9f8a..79b1cf7521db 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch -, cmake, perl, go, python3 +, cmake, pkg-config, perl, go, python3 , protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 }: @@ -9,41 +9,28 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "33.0.3"; + version = "33.0.3p1"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-jOF02reB1d69Ke0PllciMfd3vuGbjvPBZ+M9PqdnC8U="; + hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg="; }; patches = [ - ./android-tools-kernel-headers-6.0.diff + (fetchpatch { + name = "add-macos-platform.patch"; + url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch"; + hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY="; + }) ]; - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i 's/usb_linux/usb_osx/g' vendor/CMakeLists.{adb,fastboot}.txt - sed -i 's/libselinux libsepol/ /g;s#selinux/libselinux/include##g' vendor/CMakeLists.{fastboot,mke2fs}.txt - sed -z -i 's/add_library(libselinux.*selinux\/libsepol\/include)//g' vendor/CMakeLists.fastboot.txt - sed -i 's/e2fsdroid//g' vendor/CMakeLists.txt - sed -z -i 's/add_executable(e2fsdroid.*e2fsprogs\/misc)//g' vendor/CMakeLists.mke2fs.txt - ''; - - nativeBuildInputs = [ cmake perl go ]; + nativeBuildInputs = [ cmake pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; # Don't try to fetch any Go modules via the network: GOFLAGS = [ "-mod=vendor" ]; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ - "-D_DARWIN_C_SOURCE" - ]; - - NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ - "-framework CoreFoundation" - "-framework IOKit" - ]; - preConfigure = '' export GOCACHE=$TMPDIR/go-cache ''; From 843734a265b0dfba3a1b87c4a7d644b10c4dd2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 13 Nov 2022 21:03:24 -0600 Subject: [PATCH 08/55] dbeaver: remove no longer needed overrides and bump webkitgtk --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 10 +--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index ceb1b9833c92..e003787efc46 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -14,7 +14,7 @@ , libXtst , zlib , maven -, webkitgtk +, webkitgtk_4_1 , glib-networking , javaPackages }: @@ -52,7 +52,7 @@ libXtst zlib ] ++ lib.optionals stdenv.isLinux [ - webkitgtk + webkitgtk_4_1 glib-networking ]; @@ -108,7 +108,7 @@ makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fe5c03a38c8..cafeb4a5811f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5775,15 +5775,7 @@ with pkgs; davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; # AlgorithmId.md5WithRSAEncryption_oid was removed in jdk15 - - # TODO: remove once maven uses JDK 11 - # error: org/eclipse/tycho/core/p2/P2ArtifactRepositoryLayout has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to 52.0 - maven = maven.override { - jdk = jdk11; - }; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; From 79059c9505281998dbfee0b7422ca28390e8bee9 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 15 Nov 2022 00:50:02 +0100 Subject: [PATCH 09/55] cups-kyocera: fix source URL --- pkgs/misc/cups/drivers/kyocera/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/misc/cups/drivers/kyocera/default.nix b/pkgs/misc/cups/drivers/kyocera/default.nix index 0a560e3188f6..cd435bc49662 100644 --- a/pkgs/misc/cups/drivers/kyocera/default.nix +++ b/pkgs/misc/cups/drivers/kyocera/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { dontStrip = true; src = fetchzip { - # this site does not like curl -> override useragent - curlOpts = "-A ''"; - url = "https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; + url = "https://web.archive.org/web/20220709011705/https://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz"; }; From 52f1f8f11073d7b5573bf92e013c5d54205fc6ca Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Tue, 15 Nov 2022 22:12:16 +0530 Subject: [PATCH 10/55] haskellPackages/extra: init brick 1.3 for swarm 0.2.0.0 Signed-off-by: Amneesh Singh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index fd91f3796fe1..152cfacf84f4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4968,7 +4968,6 @@ broken-packages: - swagger - swagger-petstore - swagger-test - - swarm - swearjure - swf - swift-lda diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index df8fbf82107c..ec1c7d35f7a6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -108,6 +108,7 @@ extra-packages: - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.0 - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 From f52a92c22678777bb8edee6dffb05047d3781cba Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Tue, 15 Nov 2022 22:12:49 +0530 Subject: [PATCH 11/55] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b1f88b5ea529..dbe697d4482e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -48516,6 +48516,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "brick_1_3" = callPackage + ({ mkDerivation, base, bimap, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, exceptions + , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck + , stm, template-haskell, text, text-zipper, unix, vector, vty + , word-wrap + }: + mkDerivation { + pname = "brick"; + version = "1.3"; + sha256 = "0lpd6685ya0va0a6n7cw70f5b1s13y8ynzac0gkxyqb1ivzj0hsb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bimap bytestring config-ini containers contravariant + data-clist deepseq directory exceptions filepath microlens + microlens-mtl microlens-th mtl stm template-haskell text + text-zipper unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector vty + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick_1_4" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, exceptions @@ -275988,9 +276015,7 @@ self: { ]; description = "2D resource gathering game with programmable robots"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "swarm"; - broken = true; }) {}; "swearjure" = callPackage From 1bb311a89e488e36250f5c362eea69dd714824ba Mon Sep 17 00:00:00 2001 From: Amneesh Singh Date: Tue, 15 Nov 2022 22:16:08 +0530 Subject: [PATCH 12/55] haskellPackages.swarm: fix broken package Signed-off-by: Amneesh Singh --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0c35d60f430a..d2932d58d5be 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2648,4 +2648,12 @@ in { # Upstream jailbreak is unreleased: https://github.com/srid/heist/commit/988692ea850b3cbe966c7dc4dd26ba1d49647706 heist-emanote = doJailbreak (dontCheck super.heist-emanote); + # 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12 + # Other dependencies are resolved with doJailbreak for both swarm and brick_1_3 + swarm = doJailbreak (super.swarm.override { + witch = super.witch_1_1_2_0; + brick = doJailbreak (dontCheck (super.brick_1_3.override { + text-zipper = super.text-zipper_0_12; + })); + }); }) From 4e2df25b918aa10f18093e9c2771da6fb34bd0c5 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 15 Nov 2022 18:20:39 -0500 Subject: [PATCH 13/55] haskellPackages: update ghc-lib-parser to 9.2.5.20221107 and fourmolu to 0.9.0.0 --- .../haskell-modules/configuration-common.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d2932d58d5be..cea6fd2a8ba8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1565,10 +1565,10 @@ self: super: { (disableCabalFlag "stan") # Sorry stan is totally unmaintained and terrible to get to run. It only works on ghc 8.8 or 8.10 anyways … ]).overrideScope (lself: lsuper: { ormolu = doJailbreak lself.ormolu_0_5_0_1; - fourmolu = doJailbreak lself.fourmolu_0_8_2_0; + fourmolu = doJailbreak lself.fourmolu_0_9_0_0; hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107; # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix, # because some packages, like ormolu, need a newer Cabal version. # ghc-paths is special because it depends on Cabal for building @@ -1589,12 +1589,12 @@ self: super: { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; - ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = lself.ghc-lib-parser_9_2_5_20221107; }); # For -f-auto see cabal.project in haskell-language-server. ghc-lib-parser-ex_9_2_0_4 = disableCabalFlag "auto" (super.ghc-lib-parser-ex_9_2_0_4.override { - ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107; }); # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 @@ -2179,7 +2179,7 @@ self: super: { # 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2 stylish-haskell = (super.stylish-haskell.override { - ghc-lib-parser = self.ghc-lib-parser_9_2_4_20220729; + ghc-lib-parser = self.ghc-lib-parser_9_2_5_20221107; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; }); From a7e53e534a2b8894aea20233e59579fa207dcb12 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 16 Nov 2022 15:50:07 +0900 Subject: [PATCH 14/55] haskellPackages.language-docker_11_0_0: generate for hadolint --- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ec1c7d35f7a6..53f53d425c95 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -144,6 +144,7 @@ extra-packages: - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 + - language-docker == 11.0.0 # required by hadolint 2.12.0, 2022-11-16 - language-javascript == 0.7.0.0 # required by purescript - lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2 - lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dbe697d4482e..c5b0978464b7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -173112,6 +173112,29 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "language-docker_11_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec + , prettyprinter, QuickCheck, split, text, time + }: + mkDerivation { + pname = "language-docker"; + version = "11.0.0"; + sha256 = "1j8aib6pq7ghmsi3l2p554l8gnapi0jd3qsi8vhdn2mgvw2n1948"; + libraryHaskellDepends = [ + base bytestring containers data-default data-default-class + megaparsec prettyprinter split text time + ]; + testHaskellDepends = [ + base bytestring containers data-default data-default-class hspec + hspec-megaparsec HUnit megaparsec prettyprinter QuickCheck split + text time + ]; + description = "Dockerfile parser, pretty-printer and embedded DSL"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "language-docker_12_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default , data-default-class, hspec, hspec-megaparsec, HUnit, megaparsec From e19effe2ec69dfae14cdb5e160f0413cba6e2d46 Mon Sep 17 00:00:00 2001 From: Jocelyn Thode Date: Thu, 17 Nov 2022 16:38:55 +0100 Subject: [PATCH 15/55] fishPlugins.colored-man-pages: init at unstable-2022-04-30 --- .../shells/fish/plugins/colored-man-pages.nix | 20 +++++++++++++++++++ pkgs/shells/fish/plugins/default.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/shells/fish/plugins/colored-man-pages.nix diff --git a/pkgs/shells/fish/plugins/colored-man-pages.nix b/pkgs/shells/fish/plugins/colored-man-pages.nix new file mode 100644 index 000000000000..435ce6e5c410 --- /dev/null +++ b/pkgs/shells/fish/plugins/colored-man-pages.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "colored-man-pages"; + version = "unstable-2022-04-30"; + + src = fetchFromGitHub { + owner = "patrickf1"; + repo = "colored_man_pages.fish"; + rev = "f885c2507128b70d6c41b043070a8f399988bc7a"; + sha256 = "0ifqdbaw09hd1ai0ykhxl8735fcsm0x2fwfzsk7my2z52ds60bwa"; + }; + + meta = with lib; { + description = "Fish shell plugin to colorize man pages"; + homepage = "https://github.com/PatrickF1/colored_man_pages.fish"; + license = licenses.mit; + maintainers = [ maintainers.jocelynthode ]; + }; +} diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index cb2d73dacc5a..4508e82d5539 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -6,6 +6,8 @@ lib.makeScope newScope (self: with self; { buildFishPlugin = callPackage ./build-fish-plugin.nix { }; + colored-man-pages = callPackage ./colored-man-pages.nix { }; + clownfish = callPackage ./clownfish.nix { }; bass = callPackage ./bass.nix { }; From 524ddeb34f94a60029bb7835cbe095ffdf647e0e Mon Sep 17 00:00:00 2001 From: Gabriella Gonzalez Date: Thu, 17 Nov 2022 16:44:16 -0600 Subject: [PATCH 16/55] haskell.packages.ghc94.{or,four}molu: Disable fixity-th flag See: https://github.com/tweag/ormolu/issues/941 --- .../haskell-modules/configuration-ghc-9.4.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 420c80404ed2..caf964eee520 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -220,4 +220,12 @@ in { hls-retrie-plugin = null; hls-splice-plugin = null; }; + + # https://github.com/tweag/ormolu/issues/941 + ormolu = overrideCabal (drv: { + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; + }) (disableCabalFlag "fixity-th" super.ormolu); + fourmolu = overrideCabal (drv: { + libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; + }) (disableCabalFlag "fixity-th" super.fourmolu); } From 84b4f550bdfd1b237971a61d45fdd1f2577ff8cc Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 18 Nov 2022 14:29:31 +0900 Subject: [PATCH 17/55] haskellPackages.ghc-lib: 9_2_4_20220729 -> 9_2_5_20221107 --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 587af092fc47..fdabda3e58a9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -105,8 +105,8 @@ self: super: { self.data-default ] ++ drv.libraryHaskellDepends or []; }) super.ghc-exactprint; - ghc-lib = doDistribute self.ghc-lib_9_2_4_20220729; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729; + ghc-lib = doDistribute self.ghc-lib_9_2_5_20221107; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_5_20221107; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_1_0; From da038b4146f0a3409971412db8f738ce6dc3535f Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 18 Nov 2022 14:34:10 +0900 Subject: [PATCH 18/55] haskell.packages.ghc94.ghc-lib: 9_4_2_20220822 -> 9_4_3_20221104 --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 420c80404ed2..b650d5e50092 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -95,8 +95,8 @@ in { dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; ghc-byteorder = doJailbreak super.ghc-byteorder; - ghc-lib = doDistribute self.ghc-lib_9_4_2_20220822; - ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_2_20220822; + ghc-lib = doDistribute self.ghc-lib_9_4_3_20221104; + ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_3_20221104; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0; hackage-security = doJailbreak super.hackage-security; hashable = super.hashable_1_4_1_0; From 7e53f5f41cdc9923fd8a62a877cc3165de02b19d Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 18 Nov 2022 12:54:51 +0100 Subject: [PATCH 19/55] haskellPackages.fourmolu_0_9_0_0: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-darwin.nix | 4 ++-- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cea6fd2a8ba8..7b6776164bc2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1619,6 +1619,9 @@ self: super: { # 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200 hls-refactor-plugin = dontCheck super.hls-refactor-plugin; + # 2022-11-18: https://github.com/haskell/haskell-language-server/commit/c1a7527c4fb348bee6093d9794b7d3e0c8d563f2 + hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.1.0.0"; doJailbreak super.hls-fourmolu-plugin; + # 2022-10-27: implicit-hie 0.1.3.0 needs a newer version of Cabal-syntax. implicit-hie = super.implicit-hie.override { Cabal-syntax = self.Cabal-syntax_3_8_1_0; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 468e2ca08c6a..5ad58d156300 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -304,9 +304,9 @@ self: super: ({ ormolu_0_5_0_1 = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.ormolu_0_5_0_1); - fourmolu_0_8_2_0 = overrideCabal (drv: { + fourmolu_0_9_0_0 = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; - }) (disableCabalFlag "fixity-th" super.fourmolu_0_8_2_0); + }) (disableCabalFlag "fixity-th" super.fourmolu_0_9_0_0); } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index fdabda3e58a9..9e0ee396b2c7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -208,7 +208,7 @@ self: super: { jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - fourmolu = super.fourmolu_0_8_2_0; + fourmolu = super.fourmolu_0_9_0_0; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8f9e6d0ce185..d37fd3f7e6a5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -989,11 +989,11 @@ self: super: builtins.intersectAttrs super { }) super.procex; # Test suite wants to run main executable - fourmolu_0_8_2_0 = overrideCabal (drv: { + fourmolu_0_9_0_0 = overrideCabal (drv: { preCheck = drv.preCheck or "" + '' export PATH="$PWD/dist/build/fourmolu:$PATH" ''; - }) super.fourmolu_0_8_2_0; + }) super.fourmolu_0_9_0_0; # Test suite needs to execute 'disco' binary disco = overrideCabal (drv: { From 67fe14bca4b56d17e9f1f8b9c2d75ec7df5f021c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?= <65870+suhr@users.noreply.github.com> Date: Fri, 18 Nov 2022 16:50:37 +0300 Subject: [PATCH 20/55] kvirc: 5.0.0 -> 2022-06-29 --- pkgs/applications/networking/irc/kvirc/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index cfc03fe37d3b..8c1a96d5234f 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "kvirc"; - version = "5.0.0"; + version = "2022-06-29"; src = fetchFromGitHub { owner = "kvirc"; repo = "KVIrc"; - rev = version; - sha256 = "1dq7v6djw0gz56rvghs4r5gfhzx4sfg60rnv6b9zprw0vlvcxbn4"; + rev = "eb3fdd6b1d824f148fd6e582852dcba77fc9a271"; + sha256 = "sha256-RT5UobpMt/vBLgWur1TkodS3dMyIWQkDPiBYCYx/FI4="; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41ff5fb69f59..184494deb7a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29972,7 +29972,7 @@ with pkgs; kupfer = callPackage ../applications/misc/kupfer { }; - kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt515.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; From a2cd287864f488fb236263679f7db2039a011b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BE=E5=9C=B0=20=E5=B8=8C=E7=95=99=E8=80=B6?= <65301509+KiruyaMomochi@users.noreply.github.com> Date: Fri, 18 Nov 2022 22:56:07 +0800 Subject: [PATCH 21/55] microsoft-edge: 105.0.1343.42 -> 107.0.1418.52 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 12aeadbca109..7a9e69421495 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "106.0.1370.17"; + version = "108.0.1462.20"; revision = "1"; - sha256 = "sha256:0g9w3a7znc3iq0y27drjv5l45zk8lm0c1djd1r30iijln8a1diak"; + sha256 = "sha256:0dfmzjfy4y07pqifyzv3rc8dbmxz8rr3v2idanla7jrks0pghcxm"; }; dev = import ./browser.nix { channel = "dev"; - version = "107.0.1375.0"; + version = "109.0.1495.2"; revision = "1"; - sha256 = "sha256:1a014jyrk5f11dr2s2mf1m8kfq39rbc5rh0bkmclbwsl83rdfdi4"; + sha256 = "sha256:1bk7dx3mf020ahzmvr9cdgcn72rjrn2420j9g362vwcl1khyxciw"; }; stable = import ./browser.nix { channel = "stable"; - version = "105.0.1343.42"; + version = "107.0.1418.52"; revision = "1"; - sha256 = "sha256:18jnq1q65989xl98j2n3wlim0j00krkjxxnkfx2h7kymqjgysm6d"; + sha256 = "sha256:1k3c5r9lq3vpc190bzs5fn944bi3af6wjxzwcliy4wzzrb5g0day"; }; } From 01ce03efa4c8e8592632501a362de69098e91f4a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 19 Nov 2022 02:01:36 +0100 Subject: [PATCH 22/55] haskellPackages.monad-bayes: remove stale jailbreak monad-bayes is now broken because it requires a too recent brick version. Removing this jailbreak will make the nature of the problem clearer at least. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b6776164bc2..55bf787c2f41 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2572,11 +2572,6 @@ self: super: { # Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1 xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant; - # 2022-09-01: - # Restrictive upper bound on base. - # Remove once version 1.* is released - monad-bayes = doJailbreak super.monad-bayes; - # Test failure after libxcrypt migration, reported upstrem at # https://github.com/phadej/crypt-sha512/issues/13 crypt-sha512 = dontCheck super.crypt-sha512; From c561c5493184eb74cc449c7a48ceff7a11fe2dba Mon Sep 17 00:00:00 2001 From: Jocelyn Thode Date: Thu, 17 Nov 2022 16:48:22 +0100 Subject: [PATCH 23/55] fishPlugins.tide: init at 5.5.1 --- pkgs/shells/fish/plugins/default.nix | 1 + pkgs/shells/fish/plugins/tide.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/shells/fish/plugins/tide.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index c67639a85a2f..bc3c39265710 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -33,4 +33,5 @@ lib.makeScope newScope (self: with self; { sponge = callPackage ./sponge.nix { }; + tide = callPackage ./tide.nix { }; }) diff --git a/pkgs/shells/fish/plugins/tide.nix b/pkgs/shells/fish/plugins/tide.nix new file mode 100644 index 000000000000..5c844212006a --- /dev/null +++ b/pkgs/shells/fish/plugins/tide.nix @@ -0,0 +1,28 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +# Due to a quirk in tide breaking wrapFish, we need to add additional commands in the config.fish +# Refer to the following comment to get you setup: https://github.com/NixOS/nixpkgs/pull/201646#issuecomment-1320893716 +buildFishPlugin rec { + pname = "tide"; + version = "5.5.1"; + + src = fetchFromGitHub { + owner = "IlanCosman"; + repo = "tide"; + rev = "v${version}"; + sha256 = "sha256-vi4sYoI366FkIonXDlf/eE2Pyjq7E/kOKBrQS+LtE+M="; + }; + + #buildFishplugin will only move the .fish files, but tide has a tide configure function + postInstall = '' + cp -R functions/tide $out/share/fish/vendor_functions.d/ + ''; + + meta = with lib; { + description = "The ultimate Fish prompt."; + homepage = "https://github.com/IlanCosman/tide"; + license = licenses.mit; + maintainers = [ maintainers.jocelynthode ]; + }; +} + From e31de6dc172758b565e789181bc8768103b7f2fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:03:13 +0100 Subject: [PATCH 24/55] python310Packages.bluetooth-adapters: 0.7.0 -> 0.8.0 https://github.com/bluetooth-devices/bluetooth-adapters/blob/main/CHANGELOG.md#v080-2022-11-16 --- .../development/python-modules/bluetooth-adapters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 1ad12fffd505..18c1b645c698 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.7.0"; + version = "0.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-c6blw0WD1V4bNZ5YaVjLbeCIug8l7PeKlrv+kzncK/s="; + hash = "sha256-K5EeDcGcjrZYQTbuYAzT7XhcAqpYW1w/jP5T0cOPsVU="; }; postPatch = '' From aa3771243ab6589d2f43aacd841204132211bdb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:03:31 +0100 Subject: [PATCH 25/55] python310Packages.bluetooth-auto-recovery: 0.3.6 -> 0.4.0 https://github.com/bluetooth-devices/bluetooth-auto-recovery/blob/main/CHANGELOG.md#v040-2022-11-16 --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 602f87584ef7..b8869f3a19ad 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "0.3.6"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-2GmBO67sUIjasF5MHrDkZ4D+dk3xN+HNpc7nSN+qTaQ="; + hash = "sha256-juGrrUqPgg1bJsMZP0iitp0NW/XrCxNq/+/fx5QNkQ4="; }; nativeBuildInputs = [ From 744635089aa329813434cb93ead04780fa503bae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 19 Nov 2022 11:03:47 +0100 Subject: [PATCH 26/55] python310Packages.bluetooth-data-tools: 0.2.0 -> 0.3.0 https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/main/CHANGELOG.md#changelog --- .../python-modules/bluetooth-data-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 7a17d84a666c..a71efb26da35 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o="; + hash = "sha256-bZ2kT9yIIHFd3/INIuJh3MdKzF8NCYNeVS/Egg5+S7I="; }; nativeBuildInputs = [ From c0ca69f7cfc081bf2837660a04b79a29ba21e51d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:47:07 +0100 Subject: [PATCH 27/55] python310Packages.bluetooth-adapters: update changelog entry --- pkgs/development/python-modules/bluetooth-adapters/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 18c1b645c698..b696b6b9369e 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -58,9 +58,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/main/CHANGELOG.md"; description = "Tools to enumerate and find Bluetooth Adapters"; homepage = "https://bluetooth-adapters.readthedocs.io/"; + changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.home-assistant.members; }; From 488dec359cd3d07161383a5bbfccb8a4fa8e09f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:48:49 +0100 Subject: [PATCH 28/55] python310Packages.bluetooth-auto-recovery: add changelog to meta --- .../python-modules/bluetooth-auto-recovery/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index b8869f3a19ad..32b9c16db880 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-juGrrUqPgg1bJsMZP0iitp0NW/XrCxNq/+/fx5QNkQ4="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for recovering Bluetooth adapters"; homepage = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery"; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a32e171a627e57122cebab171498be55012fd3c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:50:38 +0100 Subject: [PATCH 29/55] python310Packages.bluetooth-data-tools: add changelog to meta --- .../python-modules/bluetooth-data-tools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index a71efb26da35..42c6965302f6 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-bZ2kT9yIIHFd3/INIuJh3MdKzF8NCYNeVS/Egg5+S7I="; }; @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for converting bluetooth data and packets"; homepage = "https://github.com/Bluetooth-Devices/bluetooth-data-tools"; + changelog = "https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 9f2103f390b25a3b13301009879dbe0a133ccd40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:55:20 +0100 Subject: [PATCH 30/55] python310Packages.python-homewizard-energy: add changelog to meta --- .../python-modules/python-homewizard-energy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 0e2261e8fce1..68bb21fba45b 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to communicate with HomeWizard Energy devices"; homepage = "https://github.com/DCSBL/python-homewizard-energy"; + changelog = "https://github.com/DCSBL/python-homewizard-energy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From bc3c333427720f6fbb9b951d83f8b6bf0d6940c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 00:56:53 +0100 Subject: [PATCH 31/55] python310Packages.python-homewizard-energy: 1.1.1 -> 1.2.0 https://github.com/DCSBL/python-homewizard-energy/releases/tag/v1.2.0 --- .../python-modules/python-homewizard-energy/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 68bb21fba45b..a52535673a6c 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aresponses +, awesomeversion , buildPythonPackage , fetchFromGitHub , poetry-core @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aaTxUx1eMM4Me4D0EkV5iDzs+yPt83/7PyPXTCTIgq8="; + hash = "sha256-tFIqlPeRMB0Q9XpA5zBBzjo0Dw2bhnYdJsXvl0A04vY="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + awesomeversion aiohttp ]; From a1328909586493419ba1bce0be75dbdc8c904560 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:23:24 +0100 Subject: [PATCH 32/55] python310Packages.thermobeacon-ble: add changelog to meta --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index cce24dae6b5e..405ab5ba5fa6 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bluetooth-devices"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-wzDujKJkUzbzZZ9FYTz78cYF06n8REF1TQiAbePDFJc="; }; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Thermobeacon BLE devices"; homepage = "https://github.com/bluetooth-devices/thermobeacon-ble"; + changelog = "https://github.com/Bluetooth-Devices/thermobeacon-ble/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From df158fc990618c52e74cd75bd0f92ed15dd15f93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:24:11 +0100 Subject: [PATCH 33/55] python310Packages.thermobeacon-ble: 0.3.2 -> 0.4.0 https://github.com/Bluetooth-Devices/thermobeacon-ble/releases/tag/v0.4.0 --- pkgs/development/python-modules/thermobeacon-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thermobeacon-ble/default.nix b/pkgs/development/python-modules/thermobeacon-ble/default.nix index 405ab5ba5fa6..b7f29f8ca8b9 100644 --- a/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "thermobeacon-ble"; - version = "0.3.2"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wzDujKJkUzbzZZ9FYTz78cYF06n8REF1TQiAbePDFJc="; + hash = "sha256-t4l5K52Shaw/J4thcP0ken/u77ZX7BsMEEA6ZUpcRKY="; }; nativeBuildInputs = [ From 99f2e5281e2ad1f9dd23085a9e7e271dc902ddf5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:41:52 +0100 Subject: [PATCH 34/55] python310Packages.pyvicare: 2.17.0 -> 2.19.0 --- pkgs/development/python-modules/pyvicare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 7a919bf0ec49..d34ee0b932e1 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.17.0"; + version = "2.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-MlGohD9W1HNLz6ZPawt55127S3zPSA1tFLNs2gu7hLk="; + sha256 = "sha256-i1RXHrIkWqZw2LzVPEQSxgWa7PkUEsG6NO6H9egPWkk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 07b8a2a0eaf0a7bc25b5215093c0f54a9a9f3c7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:47:58 +0100 Subject: [PATCH 35/55] python310Packages.pyunifiprotect: add changelog to meta --- pkgs/development/python-modules/pyunifiprotect/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 2635a5484b64..5baf3f423d38 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -94,6 +94,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for interacting with the Unifi Protect API"; homepage = "https://github.com/briis/pyunifiprotect"; + changelog = "https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 1d28826768518837140e2d8b6d7badb9abea7985 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 20 Nov 2022 01:51:10 +0100 Subject: [PATCH 36/55] python310Packages.pyunifiprotect: 4.4.1 -> 4.4.2 https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.4.2 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 5baf3f423d38..f8faa56b5a53 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.4.1"; + version = "4.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -38,13 +38,12 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lwgYvmig3yIQPcmX2suStcnzEYOXphHTRn40iJZICPs="; + hash = "sha256-30nQ02UUXJHvHC+hWTWHsUeU83G8cOJHK+Tgo6AE5jc="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "--cov=pyunifiprotect --cov-append" "" \ - --replace "pydantic!=1.9.1" "pydantic" + --replace "--cov=pyunifiprotect --cov-append" "" ''; nativeBuildInputs = [ From c9543015d02271ee41890f72d551a3872e8b4f8f Mon Sep 17 00:00:00 2001 From: David Wilemski Date: Sat, 19 Nov 2022 22:04:52 -0600 Subject: [PATCH 37/55] nixos/firewall: remove stray quote from package option This quote is not needed and shows up rendered in the manpage documenting this option. --- nixos/modules/services/networking/firewall.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 0242a3780ffc..27119dcc57c5 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -325,7 +325,7 @@ in example = literalExpression "pkgs.iptables-legacy"; description = lib.mdDoc '' - The iptables package to use for running the firewall service." + The iptables package to use for running the firewall service. ''; }; From d1bd45165c58fafb6776ec069fff94f6b99b035b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 05:05:39 +0000 Subject: [PATCH 38/55] subfinder: 2.5.4 -> 2.5.5 --- pkgs/tools/networking/subfinder/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 1cf81ab8263f..88c87eabe195 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.4"; + version = "2.5.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I8VC/fwcDXqdT7U1WrptqVWufCLbk+3Zc2iXsBj6Fno="; + sha256 = "sha256-Wc/cm3vePIXBCcInsLZ3n/QV/3qHmGGrPr6coUqJPpE="; }; - vendorSha256 = "sha256-3K2jZRJksY/rzRiFjgU06fkXpySkJI0JTTGvvEDwS6s="; + vendorSha256 = "sha256-uynfhwCR13UZR/Bk/oPwMuifLGn33qVPEyrpOSgeafY="; modRoot = "./v2"; From 6ba0d204871319a430b584fed30e9b0c605c66bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 06:37:02 +0000 Subject: [PATCH 39/55] igv: 2.14.1 -> 2.15.1 --- pkgs/applications/science/biology/igv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 09dc8daa4699..826271425663 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.14.1"; + version = "2.15.1"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-IXUyMAhKyNMb7tINlr+9JmPlDRpHzgGS/SXo1Mz5o0Q="; + sha256 = "sha256-hwZ6Pl6BxoVbJI5e3b0s7jhQ/AADhVJVqM9Q8ppERuk="; }; installPhase = '' From 11adfafdee3c05a3b52781d63fc306f3d1fd8a72 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 03:38:45 +0000 Subject: [PATCH 40/55] mycorrhiza: 1.12.1 -> 1.13.0 --- pkgs/servers/mycorrhiza/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mycorrhiza/default.nix b/pkgs/servers/mycorrhiza/default.nix index bbe136eb94c8..342d7a3ec555 100644 --- a/pkgs/servers/mycorrhiza/default.nix +++ b/pkgs/servers/mycorrhiza/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "mycorrhiza"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; rev = "v${version}"; - sha256 = "sha256-Fh3BZTDBLaus5ytnHzvknFMrKVssc6+d85mGHv6EmLo="; + sha256 = "sha256-zRDMfHjR1obagRItdlmO1fJnutMM8MqcKNc3ZjtuvnY="; }; vendorSha256 = "sha256-Z6pQwUMMgHLMrRN4Fpu1QyG7WCHGWuvBc2UBTY6jncU="; From ad948687d5079f6116c0bd9d47bb1b46cf023e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 17:58:39 +0000 Subject: [PATCH 41/55] helmsman: 3.15.0 -> 3.15.1 --- pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index aa3268435738..4915b2766ee7 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.15.0"; + version = "3.15.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-wKemvUk5UP4LweX9JxbsYlrjuVRgchkOvlHqRYvAB9A="; + sha256 = "sha256-LgfYcptC1fcINf80dbOZu8HD5oTrF0tTMQCWdsO3H5U="; }; - vendorSha256 = "sha256-swUZqrQ0nJS66oyqn0ONmFutLR2mEnDviC8siQB19c8="; + vendorSha256 = "sha256-iEsblhejczTFPL7LvEKHE/T1h2xAt7cdnoR8KIv3Wpo="; doCheck = false; From c85bc3d20b81bccb5d839455d6a0f002d5e40119 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Nov 2022 00:26:03 +0000 Subject: [PATCH 42/55] doppler: 3.45.0 -> 3.52.1 --- pkgs/tools/security/doppler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 0389ad3c52b0..630983842a46 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.45.0"; + version = "3.52.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-kQio3l50gjPfywUpeTEt4Xon1p07XpgStNSmICPboXQ="; + sha256 = "sha256-ppgFUO5WxraG83zX8tHahT/ixSJjrTmmiIrJPpbkZVs="; }; - vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo="; + vendorSha256 = "sha256-TwcEH+LD0E/JcptMCYb3UycO3HhZX3igzSlBW4hS784="; ldflags = [ "-s -w" From 8cfb8db3987e0347280695ec8fa4be49fbb216f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 06:12:29 +0000 Subject: [PATCH 43/55] terrascan: 1.16.0 -> 1.17.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 21abae88c7af..56f5d676a8b8 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J54x3t3tgo5CUnYEhduOGw23MhAiqq/XudGmSQ3ENbs="; + sha256 = "sha256-I7tA6FRsG3miIXibmBAFvanIyI8jgThrInQEzUCxvAs="; }; - vendorSha256 = "sha256-0ZwTE2FrBung7HAlklGIJlX76eRWa0ALNWjZpZijkzA="; + vendorSha256 = "sha256-ahj67MoS+VXNlh5dRA722tq27JRQGaC7TejOVIAH8ms="; # Tests want to download a vulnerable Terraform project doCheck = false; From 6b3c6dc85f6632af10158f8a87cc725978689f9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 06:37:33 +0000 Subject: [PATCH 44/55] tippecanoe: 2.11.0 -> 2.13.0 --- pkgs/applications/misc/tippecanoe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/applications/misc/tippecanoe/default.nix index d3fa86aedcde..7eccdbcc8d48 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/applications/misc/tippecanoe/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.11.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-WFvpq0g+P9gs0VudKB5mVTo/cvWMsaxf13ZORUTf/7c="; + hash = "sha256-YgmePs0GxygR0hvcnRngzW77QZTOygSYvRaYk6oCVls="; }; buildInputs = [ sqlite zlib ]; From 38d81f21326497c7f1833b7e7f395aa8f8c6ab17 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 20 Nov 2022 01:38:49 -0500 Subject: [PATCH 45/55] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 6 ++++++ .../transitive-broken.yaml | 7 ++++--- .../haskell-modules/hackage-packages.nix | 19 ++++++++++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 152cfacf84f4..89a0bdf77fa1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -445,6 +445,7 @@ broken-packages: - boombox - boots-app - boring-window-switcher + - borsh - bot - botpp - bottom @@ -1354,6 +1355,7 @@ broken-packages: - etcd - ethereum-rlp - eurofxref + - evdev-streamly - eve - eved - event @@ -1953,6 +1955,7 @@ broken-packages: - HaPy - haquery - harchive + - harfbuzz-pure - HARM - HarmTrace-Base - haroonga @@ -3296,6 +3299,7 @@ broken-packages: - monadacme - monad-atom - monad-atom-simple + - monad-bayes - monad-branch - MonadCatchIO-transformers - monad-choice @@ -4954,6 +4958,7 @@ broken-packages: - supervisor - supervisors - supplemented + - supply-chain-core - surjective - sv-core - SVD2HS @@ -5109,6 +5114,7 @@ broken-packages: - text-and-plots - text-ascii - text-builder-linear + - text-compression - text-containers - text-display - text-format-heavy diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2d37ceb24adc..64bfa3ad8721 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -641,6 +641,7 @@ dont-distribute-packages: - apiary-websockets - apis - apotiki + - appendful-persistent - approx-rand-test - arbor-monad-metric-datadog - archive-tar-bytestring @@ -1531,6 +1532,7 @@ dont-distribute-packages: - geni-util - geniconvert - geniserver + - genvalidity-appendful - genvalidity-network-uri - genvalidity-sydtest - genvalidity-sydtest-aeson @@ -2190,9 +2192,6 @@ dont-distribute-packages: - hsql-odbc - hsql-postgresql - hsql-sqlite3 - - hsqml-datamodel-vinyl - - hsqml-demo-morris - - hsqml-morris - hsreadability - hssqlppp-th - hstar @@ -3566,6 +3565,7 @@ dont-distribute-packages: - sql-simple-pool - sql-simple-postgresql - sql-simple-sqlite + - sqlite-easy - sqlite-simple-typed - sqsd-local - sscgi @@ -3629,6 +3629,7 @@ dont-distribute-packages: - supercollider-midi - superconstraints - supernova + - supply-chain - sv - sv-cassava - sv-svfactor diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c5b0978464b7..ccf23e9adb86 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -33301,6 +33301,7 @@ self: { ]; testToolDepends = [ sydtest-discover ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "appendmap" = callPackage @@ -47889,6 +47890,8 @@ self: { ]; description = "Implementation of BORSH serialisation"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bot" = callPackage @@ -93336,6 +93339,8 @@ self: { description = "Bridge for working with evdev and streamly"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "eve" = callPackage @@ -108255,6 +108260,7 @@ self: { appendful base criterion genvalidity-criterion ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "genvalidity-bytestring" = callPackage @@ -127161,7 +127167,9 @@ self: { executableHaskellDepends = [ base bytestring parallel text ]; description = "Pure-functional Harfbuzz language bindings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "shape-text"; + broken = true; }) {inherit (pkgs) harfbuzz;}; "harg" = callPackage @@ -151658,7 +151666,6 @@ self: { ]; description = "HsQML DataModel instances for Vinyl Rec"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-manic" = callPackage @@ -151695,7 +151702,6 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; @@ -151749,7 +151755,6 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; @@ -192919,7 +192924,9 @@ self: { ]; description = "A library for probabilistic programming"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "monad-bool" = callPackage @@ -268279,6 +268286,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A primitive yet easy to use sqlite library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sqlite-simple" = callPackage @@ -275446,6 +275454,7 @@ self: { libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "supply-chain-core" = callPackage @@ -275458,6 +275467,8 @@ self: { testHaskellDepends = [ base tasty tasty-hedgehog tasty-hunit ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "surjective" = callPackage @@ -283741,6 +283752,8 @@ self: { ]; description = "A text compression library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-containers" = callPackage From 3827a60a7f48d4012fc515a3edff5f167d367182 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 20 Nov 2022 10:22:57 +0300 Subject: [PATCH 46/55] plasma-framework, kconfig: 5.100.0 -> 5.100.1 Hotfix for weird looking sliders. --- .../libraries/kde-frameworks/srcs.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 66853a1c3744..c6ae8457517c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -132,11 +132,11 @@ }; }; kconfig = { - version = "5.100.0"; + version = "5.100.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.0.tar.xz"; - sha256 = "08f93na14s9zcwl6vfk9ix4jm1lwcmalh4yyf6m3p5ga5fd39vbs"; - name = "kconfig-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/kconfig-5.100.1.tar.xz"; + sha256 = "1nl2ibqxgjd2zppiibnsvdpp5ci8ydz8i685gfgji3jfsx8pkfwb"; + name = "kconfig-5.100.1.tar.xz"; }; }; kconfigwidgets = { @@ -596,11 +596,11 @@ }; }; plasma-framework = { - version = "5.100.0"; + version = "5.100.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.0.tar.xz"; - sha256 = "101jqybbzl6cnfh3w6gghd0916kbdwxqn1086q9i2fnvg503cxk4"; - name = "plasma-framework-5.100.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.100/plasma-framework-5.100.1.tar.xz"; + sha256 = "18ddniihbj26gz3lqh36xghwdszwgazkvpgr1bghb8bk0y90m52k"; + name = "plasma-framework-5.100.1.tar.xz"; }; }; prison = { From 06d3d727c5a8795484f36c7c79bc981638da95ef Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 20 Nov 2022 02:45:35 -0500 Subject: [PATCH 47/55] haskellPackages: stop evaluating hyper-haskell-server-with-packages in jobset --- pkgs/top-level/release-haskell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index efef4c769435..5f18d36f29f0 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -205,7 +205,7 @@ let hlint hpack # hyper-haskell # depends on electron-10.4.7 which is marked as insecure - hyper-haskell-server-with-packages + # hyper-haskell-server-with-packages # hyper-haskell-server is broken icepeak idris ihaskell From 6bd8620d06bc330870bd6150ae94c475a76438fc Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 20 Nov 2022 02:58:53 -0500 Subject: [PATCH 48/55] haskellPackages.hsqml: disable new packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 53f53d425c95..8e9df640f283 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -658,9 +658,12 @@ dont-distribute-packages: - gi-webkit - hsqml - hsqml-datamodel + - hsqml-datamodel-vinyl - hsqml-demo-manic + - hsqml-demo-morris - hsqml-demo-notes - hsqml-demo-samples + - hsqml-morris - hstorchat - jsaddle-webkitgtk - jsc diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ccf23e9adb86..b32900944af0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -151666,6 +151666,7 @@ self: { ]; description = "HsQML DataModel instances for Vinyl Rec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hsqml-demo-manic" = callPackage @@ -151702,6 +151703,7 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; @@ -151755,6 +151757,7 @@ self: { ]; description = "HsQML-based implementation of Nine Men's Morris"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "hsqml-morris"; }) {}; From 0a84f7879f8bd7922bef9822365997f2ebb376d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 22:03:06 +0000 Subject: [PATCH 49/55] prometheus-nats-exporter: 0.10.0 -> 0.10.1 --- pkgs/servers/monitoring/prometheus/nats-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix index 4a7b3507730d..e77921a6e2b2 100644 --- a/pkgs/servers/monitoring/prometheus/nats-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "prometheus-nats-exporter"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qUnlPGniqStU5jVg+5SR8aYO7BLo7+d+UWPPm13ov0I="; + sha256 = "sha256-+qMhHmsvlUWjDhmSXv2TytuOPmJcXdSGBd7c5PdE9xI="; }; vendorSha256 = "sha256-hlC/s0pYhNHMv3i7Nmu4r6jnXGpc6raScv5dO32+tfQ="; From c4dca7438cd60b69edd08e337b6a1fef535a3a27 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 20 Nov 2022 11:57:10 +0100 Subject: [PATCH 50/55] fatsort: fix build, cleanup, enable on darwin --- pkgs/tools/filesystems/fatsort/default.nix | 26 +++++++++++--- .../fatsort/fatsort-Makefiles.patch | 34 ------------------- 2 files changed, 21 insertions(+), 39 deletions(-) delete mode 100644 pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index 6db496242d24..d01ebce489c8 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -1,4 +1,9 @@ -{lib, stdenv, fetchurl, help2man}: +{ lib +, stdenv +, fetchurl +, help2man +, libiconv +}: stdenv.mkDerivation rec { version = "1.6.4.625"; @@ -9,17 +14,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-mm+JoGQLt4LYL/I6eAyfCuw9++RoLAqO2hV+CBBkLq0="; }; - patches = [ ./fatsort-Makefiles.patch ]; + buildInputs = [ help2man ] + ++ lib.optionals stdenv.isDarwin [ libiconv ]; - buildInputs = [ help2man ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + # make install target is broken (DESTDIR usage is insane) + # it's easier to just skip make and install manually + installPhase = '' + runHook preInstall + install -D -m 755 ./src/fatsort $out/bin/fatsort + install -D -m 644 ./man/fatsort.1 $out/man/man1/fatsort.1 + runHook postInstall + ''; meta = with lib; { homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch deleted file mode 100644 index 51775edfb41d..000000000000 --- a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -uNr fatsort-1.6.2.605.orig/Makefile fatsort-1.6.2.605.new/Makefile ---- fatsort-1.6.2.605.orig/Makefile 2019-11-16 16:40:27.000000000 +0100 -+++ fatsort-1.6.2.605.new/Makefile 2020-05-10 21:34:34.820874026 +0200 -@@ -1,4 +1,5 @@ --MANDIR=/usr/local/share/man/man1 -+PREFIX?=/usr/local -+MANDIR=$(PREFIX)/share/man/man1 - - INSTALL_FLAGS=-m 0755 -p -D - -diff -uNr fatsort-1.6.2.605.orig/src/Makefile fatsort-1.6.2.605.new/src/Makefile ---- fatsort-1.6.2.605.orig/src/Makefile 2018-11-17 00:40:59.000000000 +0100 -+++ fatsort-1.6.2.605.new/src/Makefile 2020-05-10 21:33:52.053391027 +0200 -@@ -30,7 +30,7 @@ - override CFLAGS += -D __CYGWIN__ - override CFLAGS += -D __LINUX__ - override LDFLAGS += -liconv -- SBINDIR=/usr/local/sbin -+ SBINDIR=$(PREFIX)/sbin - endif - else - ifdef MINGW -@@ -60,9 +60,9 @@ - # OS X's install does not support the '-D' flag. - INSTALL_FLAGS=-m 0755 -p - # Mac OS X does not have a "/usr/local/sbin" -- SBINDIR=/usr/local/bin -+ SBINDIR=$(PREFIX)/bin - else -- SBINDIR=/usr/local/sbin -+ SBINDIR=$(PREFIX)/sbin - endif - endif - endif From 991053d8a0e1543475d09cb8272c42e8ebe66755 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 10:34:17 +0000 Subject: [PATCH 51/55] v2ray-geoip: 202211100058 -> 202211170054 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 52183660ad04..66eb722ad91a 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202211100058"; + version = "202211170054"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "6fcf11f003829b16b534a710a26549b741e81311"; - sha256 = "sha256-XlqfXRJa4xnw8lqC94TfRcXVW/8L7hrqENfC7A7rTpI="; + rev = "e01c82114de0b2f3a2e8c80c78fc22e8fb71f68a"; + sha256 = "sha256-T94G1s3vTkh0pd2ByOpOwJDPn7geaHbnBB7w1K9qwps="; }; installPhase = '' From 6976207a6c58ecea03dfb62aa0b8f82039d977ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 20:11:21 +0000 Subject: [PATCH 52/55] pscale: 0.122.0 -> 0.124.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index 49377c7cd598..d60aa24f9c0a 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.122.0"; + version = "0.124.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gvz05VquRLKXMf45pxFAZCtyGWpn/DgOjRCHU6jTI/E="; + sha256 = "sha256-bNMUUohiMa/fSP1HjrB0UR3kWh+HNqqqpLcraw6UNjs="; }; - vendorSha256 = "sha256-HPlzro95wIYLwG1Sq5cgVFmUpEfKlhfWLfQTDS5c3bg="; + vendorSha256 = "sha256-cd4oAS81zUMImCkFsTIcgYJDB2pvMWYRnTPFkznSr+I="; ldflags = [ "-s" "-w" From 732f0048612f0341c51476e67acc59da31e48932 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Nov 2022 05:37:23 +0000 Subject: [PATCH 53/55] symfony-cli: 5.4.18 -> 5.4.19 --- pkgs/development/tools/symfony-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index e25d27591eed..0812e35a04e3 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.18"; - vendorSha256 = "sha256-hIi+WmLxCTFbu8E++CJkp4bOUrK81PkojRk60SljVik="; + version = "5.4.19"; + vendorSha256 = "sha256-P5KEliTqj9kGYffhl014QK6qPY9gLG+bViOz4dtsQwA="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-hRG21rXubS8K273qSjrY+U6n5bpa2kzOCqIXmapTAzs="; + sha256 = "sha256-GAsyI8I+tHFMV/LqwPx2ph+w3zaqKSn9vieVQcuO+y0="; }; postInstall = '' From 959df5f2b2519c5ae6c743a0b7a2dbf75b250da2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Nov 2022 17:18:58 +0000 Subject: [PATCH 54/55] openxr-loader: 1.0.25 -> 1.0.26 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index b4b438e4a810..4cd1490fd4bf 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.25"; + version = "1.0.26"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-8fCz+t+PcZflq3sYdn+J6AdWHkG6UyDNcQmJ21b9p80="; + sha256 = "sha256-Ou6IwCvRJE4pB/69Sjmc5fZPMvjaDvPOs0Qgol9rTEA="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; From d14c42b9d410b6614641747130b508eb8035c039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Nov 2022 02:46:09 +0000 Subject: [PATCH 55/55] sdrangel: 7.7.0 -> 7.8.3 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index fece0869a0bd..45f609c08f23 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -42,13 +42,13 @@ mkDerivation rec { pname = "sdrangel"; - version = "7.7.0"; + version = "7.8.3"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "sha256-du5mNGMrXt6iFjb/QXQsW1DpGfIlVjqrbmsQZb4mMZQ="; + sha256 = "sha256-zP3Ic0mru0FcX7ZuE/IKGmHA596lq5Y1cWdBESzzU0U="; fetchSubmodules = false; };