From 55aab11e91b69b9251c75ac9d0dc1da969d1b2fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Mar 2023 16:46:27 +0000 Subject: [PATCH 01/75] parallel: 20230222 -> 20230322 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index f4ed291890fb..dc1971b465cd 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20230222"; + version = "20230322"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-bTal6gl2aN23gOdOL/ACUtoWOZWkselu9jOpmyCcmA4="; + sha256 = "sha256-5cexum0MvJ1NxYqj4hyJcMWuSbD9D69Or4vb1gAre8o="; }; outputs = [ "out" "man" "doc" ]; From 81a6a27b15d2c2b9e58f43b458f909693c1b1844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Mar 2023 01:58:57 +0000 Subject: [PATCH 02/75] icingaweb2-ipl: 0.10.1 -> 0.11.0 --- pkgs/servers/icingaweb2/ipl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/ipl.nix b/pkgs/servers/icingaweb2/ipl.nix index 06e545ed9606..491bd472c673 100644 --- a/pkgs/servers/icingaweb2/ipl.nix +++ b/pkgs/servers/icingaweb2/ipl.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2-ipl"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "Icinga"; repo = "icinga-php-library"; rev = "v${version}"; - hash = "sha256-zeKI8D9anPYYvNTNyl1Ej9NT7eoM4KgX5Oto783kYoI="; + hash = "sha256-3Vf3jT+/jh1YxJrnOFuGkhNIOyioZavSAHMmmkgA2gg="; }; installPhase = '' From 87865f3c8d5cdfbd28a05840c0f9ff19b92edba4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 9 Apr 2023 23:54:12 +0000 Subject: [PATCH 03/75] netmaker-full: 0.17.1 -> 0.18.5 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index 4268191b42ff..1e275786b0e2 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.17.1"; + version = "0.18.5"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-8uxPPhy1/FqPGouqzUxY2lGnO/giqH9bJbAqQ9rZI0g="; + hash = "sha256-IUicsTgw6i6a9glgbUtt2sEPHIj/qQFJ3xnCJm9igdk="; }; - vendorHash = "sha256-4LaGwwDu3pKd6I6r/F3isCi9CuFqPGvc5SdVTV34qOI="; + vendorHash = "sha256-E4LjfKovOoXIru0PMEidOCpEYMNf1wSDP4lWiqRigI4="; inherit subPackages; From 070aa0e77ee24557e4d552a4aced88446bb4679e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 13 Apr 2023 12:18:11 +0200 Subject: [PATCH 04/75] all-cabal-hashes: 2023-04-07T21:49:23Z -> 2023-04-13T09:45:26Z 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 98511f02eaf0..d63e66d45f30 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a88deb396b19367026b858afe79fa1d0e0c1bc4f.tar.gz", - "sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4", - "msg": "Update from Hackage at 2023-04-07T21:49:23Z" + "commit": "88252bfad2741817b521acc02a424b878264bf9f", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88252bfad2741817b521acc02a424b878264bf9f.tar.gz", + "sha256": "00nc417r9xrknhmyjh3rfxlsbchizxicnbp98q63yb5czdapg4bm", + "msg": "Update from Hackage at 2023-04-13T09:45:26Z" } From be1ad3419a740a71dfa1d540553a4a85e7df7ce6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 13 Apr 2023 12:20:34 +0200 Subject: [PATCH 05/75] 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 | 855 ++++++++++++++---- 1 file changed, 664 insertions(+), 191 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3b3d0853f626..71649d34bd54 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3187,6 +3187,8 @@ self: { pname = "Chart"; version = "1.9.4"; sha256 = "0ylxin419s35xq1j4hcnylrch3m252wqdkfjp5b323qhv4a8y1im"; + revision = "1"; + editedCabalFile = "0l9irzb4zq5jhgl1rvwgxz6rrzxjndj4arjv7adlzs5zl43iazqr"; libraryHaskellDepends = [ array base colour data-default-class lens mtl old-locale operational time vector @@ -14427,8 +14429,8 @@ self: { ({ mkDerivation, base, doctest, hspec, process, time }: mkDerivation { pname = "Monadoro"; - version = "0.3.6.1"; - sha256 = "1163109ps6nlizf7ng5vyjfz0033qnn8bpnayd0qdy9ipcd98c5m"; + version = "0.3.6.2"; + sha256 = "0hlgxk6p863h5l8x1qivbk41g8i4pngiy63x6y153i9j7v3nhbrh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -22903,12 +22905,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "Yampa_0_14_1" = callPackage + "Yampa_0_14_2" = callPackage ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.14.1"; - sha256 = "0q2fgm2la2xyvnpfwl163md31g0m8kb0n2cxm26nfnljnbwq3a5b"; + version = "0.14.2"; + sha256 = "0d063a1giib89pm4d2v3y90dfjrldijff8izwgjazw0ivh515qqp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -25567,6 +25569,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "aern2-mp_0_2_15_0" = callPackage + ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec + , integer-logarithms, mixed-types-num, QuickCheck, reflection + , regex-tdfa, template-haskell + }: + mkDerivation { + pname = "aern2-mp"; + version = "0.2.15.0"; + sha256 = "04kjjd86q2hj13y8dvnqfir6dhqy2n5nx6xr7q19f0j0sc0654vl"; + libraryHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + testHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + description = "Multi-precision ball (interval) arithmetic"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "aern2-real" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck @@ -25587,14 +25611,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "aern2-real_0_2_13_0" = callPackage + "aern2-real_0_2_15" = callPackage ({ mkDerivation, aern2-mp, base, collect-errors, hspec , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.2.13.0"; - sha256 = "13k0nb12zyp560chjwrk0jn677s7qycv976vv462niiqrc0z4zh7"; + version = "0.2.15"; + sha256 = "0r3b2m728dwsyj5qcy7pczmbvcnb7712jj830pssy2065d1ws2rx"; libraryHaskellDepends = [ aern2-mp base collect-errors hspec integer-logarithms mixed-types-num QuickCheck @@ -25622,8 +25646,8 @@ self: { pname = "aeson"; version = "1.5.6.0"; sha256 = "1s5z4bgb5150h6a4cjf5vh8dmyrn6ilh29gh05999v6jwd5w6q83"; - revision = "6"; - editedCabalFile = "0bc55wc1ad5qvaf8kf8gbwvzd4i0qmgwykidcl5gb2bam3scb870"; + revision = "7"; + editedCabalFile = "1qbsyy605hlfh7wfj3q33yx0xmb4n81z6h0y99x7khyxmy0plqbf"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -26285,6 +26309,8 @@ self: { pname = "aeson-optics"; version = "1.2.0.1"; sha256 = "0b7frw4fm5hn611i8ldbnkq1h47vjw4fn6f85sj38fw2cn4n826j"; + revision = "1"; + editedCabalFile = "18da6lkjlxrsg1py5nqjhgbv7ffxalsjx28an5np3bdvgzcf1klg"; libraryHaskellDepends = [ aeson attoparsec base bytestring optics-core optics-extra scientific text text-short vector @@ -34407,6 +34433,8 @@ self: { pname = "arch-hs"; version = "0.11.0.0"; sha256 = "0zl9lsz9bhzyd4vd61q0rkawb7iyghk9cb5pzm4gm4y9d9hayw0p"; + revision = "1"; + editedCabalFile = "0gkbiyqjslrfa6zfik9zhf3ccrgdv9fh29rbgsl3qky8vq88dg3h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35032,6 +35060,37 @@ self: { license = lib.licenses.mit; }) {}; + "arithmoi_0_12_1_0" = callPackage + ({ mkDerivation, array, base, chimera, constraints, containers + , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots + , mod, QuickCheck, quickcheck-classes, random, semirings + , smallcheck, tasty, tasty-bench, tasty-hunit, tasty-quickcheck + , tasty-rerun, tasty-smallcheck, transformers, vector + }: + mkDerivation { + pname = "arithmoi"; + version = "0.12.1.0"; + sha256 = "1g8jswfjcy8q7fg7qf5d2yq1amxwwvpai97n96cgl6hrfz6y1ghf"; + configureFlags = [ "-f-llvm" ]; + libraryHaskellDepends = [ + array base chimera constraints containers deepseq exact-pi + integer-gmp integer-logarithms integer-roots mod random semirings + transformers vector + ]; + testHaskellDepends = [ + base containers exact-pi integer-gmp integer-roots mod QuickCheck + quickcheck-classes random semirings smallcheck tasty tasty-hunit + tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector + ]; + benchmarkHaskellDepends = [ + array base constraints containers deepseq integer-logarithms mod + random semirings tasty-bench vector + ]; + description = "Efficient basic number-theoretic functions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "arity-generic-liftA" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -35138,16 +35197,16 @@ self: { "array-builder" = callPackage ({ mkDerivation, array-chunks, base, bytebuild, byteslice - , primitive, run-st, tasty, tasty-hunit, text-short + , bytestring, natural-arithmetic, primitive, run-st, tasty + , tasty-hunit, text-short }: mkDerivation { pname = "array-builder"; - version = "0.1.2.0"; - sha256 = "13km1jpr1wwvy2c43b3176hvj2a539758cpcgvqfy36gxxaasffw"; - revision = "1"; - editedCabalFile = "0hrh5qyjs2yhw5y9wv87ykzhxlxwq9h2d0cbaylhv3xkvq4gglyh"; + version = "0.1.3.0"; + sha256 = "1al32j1akh83lsmzppkv0290xz42qndfsqnyyx568v8q0lfgw605"; libraryHaskellDepends = [ - array-chunks base bytebuild byteslice primitive run-st text-short + array-chunks base bytebuild byteslice bytestring natural-arithmetic + primitive run-st text-short ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Builders for arrays"; @@ -36064,16 +36123,16 @@ self: { "asn1-ber-syntax" = callPackage ({ mkDerivation, array-chunks, base, base16, bytebuild, byteslice - , bytesmith, bytestring, contiguous, filepath, natural-arithmetic - , pretty-simple, primitive, QuickCheck, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, text-short, vector + , bytesmith, bytestring, chronos, contiguous, filepath + , natural-arithmetic, pretty-simple, primitive, QuickCheck, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text-short, vector }: mkDerivation { pname = "asn1-ber-syntax"; - version = "0.1.0.0"; - sha256 = "0rdn482cdbx149m1048lk894yhdh12ac8iw0d9wmx245627j4cvd"; + version = "0.2.0.0"; + sha256 = "0wh2xr01iah472zi282p1affvsira6jd8y1x9ph0jmg7xn4q3cb8"; libraryHaskellDepends = [ - array-chunks base bytebuild byteslice bytesmith bytestring + array-chunks base bytebuild byteslice bytesmith bytestring chronos contiguous natural-arithmetic primitive text-short vector ]; testHaskellDepends = [ @@ -37781,12 +37840,13 @@ self: { }) {}; "attoparsec-run" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, text }: + ({ mkDerivation, attoparsec, base, bytestring, hspec, mtl, text }: mkDerivation { pname = "attoparsec-run"; - version = "0.0.1.0"; - sha256 = "0sdia624pxc0xj7lvai0hw41zjnkfz2da3vpc9mlhldiwzdwa815"; - libraryHaskellDepends = [ attoparsec base bytestring text ]; + version = "0.0.2.0"; + sha256 = "0j9mj61aa4hw4j2z73fxjb1py8yhznk3irw2cqs9l40kmqlf0gz8"; + libraryHaskellDepends = [ attoparsec base bytestring mtl text ]; + testHaskellDepends = [ attoparsec base bytestring hspec mtl text ]; description = "Conveniently run Attoparsec parsers"; license = lib.licenses.asl20; }) {}; @@ -40335,8 +40395,8 @@ self: { }: mkDerivation { pname = "balkon"; - version = "0.2.1.0"; - sha256 = "0nw6ghpyyra7b1klmvyf1y8xappddyzja9lp2w5sih8103slvb2y"; + version = "0.3.0.0"; + sha256 = "0kfg294f4h37vb9h0v54wfvmrw6pfh90yc6zjlbgk4kszvqx44jk"; libraryHaskellDepends = [ base harfbuzz-pure text text-icu unicode-data-scripts ]; @@ -44071,8 +44131,8 @@ self: { pname = "binary-tagged"; version = "0.3.1"; sha256 = "01d1wb8h5mz76l09r2azphvhm1y3nar8pqrh2waxn797bd2dh6fp"; - revision = "2"; - editedCabalFile = "0w0n299j37w4xyf69wlfs1s06m01y6yyh9r5clacrr5m893rxy9a"; + revision = "3"; + editedCabalFile = "1r8bwv9jkjl7ygmyhzbh9knsfzc8sd8lvkzvh00rn7dibs0kid1q"; libraryHaskellDepends = [ array base base16-bytestring binary bytestring containers structured tagged @@ -46745,8 +46805,8 @@ self: { pname = "blank-canvas"; version = "0.7.3"; sha256 = "1g10959ly5nv2xfhax4pamzxnxkqbniahplc5za8k5r4nq1vjrm2"; - revision = "11"; - editedCabalFile = "1dyg4f4ji23lvq8ma7j7423z5ssd4ahbb1qgw1w586abbhziicn2"; + revision = "12"; + editedCabalFile = "0jngs4gbqkraxqkziyb9jw4mf3dcj62nwh0gnf8dbpb2dsp3qnyn"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base base-compat-batteries base64-bytestring bytestring @@ -48830,8 +48890,8 @@ self: { pname = "bound-extras"; version = "0.0.2"; sha256 = "1mrsr75yd55p3rgqqjlhs0f498qgbmj12ldadj4frmkhjqf3vf9y"; - revision = "1"; - editedCabalFile = "07mqf5ycbjj31q1d8b2szzb96nigfhn9iv1h153ks8cgjh5ir8qj"; + revision = "2"; + editedCabalFile = "1735mxrj5f05b3dikhj1c2vz2a5hl5plnx2wa71bizwnc6p6qa7d"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -49425,8 +49485,8 @@ self: { ({ mkDerivation, base, brick, containers, microlens, vector }: mkDerivation { pname = "brick-list-search"; - version = "0.1.2.1"; - sha256 = "1kn5i8nhq8a5g62rnfpy1kzxfn7y2ffx4l4llfvm19nmvksr8vb3"; + version = "0.1.2.2"; + sha256 = "06y0pz0rny9pbm5lzc6n64zdf7139dgwbghc908vzndm6pcjrs5h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick containers microlens vector ]; @@ -49436,6 +49496,19 @@ self: { broken = true; }) {}; + "brick-list-skip" = callPackage + ({ mkDerivation, base, brick, containers, microlens, vector }: + mkDerivation { + pname = "brick-list-skip"; + version = "0.1.1.0"; + sha256 = "1k1ms2jrf9s4h9v5s1wbw1v0d55giy93mw77x5xsfscm9aqbyd9b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base brick containers microlens vector ]; + description = "Skip a certain kind of items when moving in brick list"; + license = lib.licenses.bsd0; + }) {}; + "brick-panes" = callPackage ({ mkDerivation, aeson, base, brick, bytestring, containers , directory, microlens, text, text-zipper, time, vector, vty @@ -55023,13 +55096,14 @@ self: { "canadian-income-tax" = callPackage ({ mkDerivation, base, bytestring, ca-province-codes, containers - , forms-data-format, monoid-subclasses, optparse-applicative - , rank2classes, template-haskell, text, time, transformers + , directory, filepath, forms-data-format, monoid-subclasses + , optparse-applicative, rank2classes, tar, template-haskell, text + , time, transformers }: mkDerivation { pname = "canadian-income-tax"; - version = "2022.1"; - sha256 = "09v404k67z3w2rynsl18wlwpayh2lgxaw82nsmc28il95ry9g82s"; + version = "2022.2.0.1"; + sha256 = "0vf820sx1jy0zba1nba3j8cz9rkzbjm44kwd18qkidqvf3xr7fg4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55037,13 +55111,13 @@ self: { monoid-subclasses rank2classes template-haskell text time ]; executableHaskellDepends = [ - base bytestring forms-data-format optparse-applicative rank2classes - text transformers + base bytestring directory filepath forms-data-format + optparse-applicative rank2classes tar text transformers ]; description = "Canadian income tax calculation"; license = lib.licenses.gpl3Plus; hydraPlatforms = lib.platforms.none; - mainProgram = "complete-canadian-t1-form"; + mainProgram = "complete-canadian-taxes"; }) {}; "candid" = callPackage @@ -56773,6 +56847,32 @@ self: { broken = true; }) {}; + "cattrap" = callPackage + ({ mkDerivation, balkon, base, bytestring, containers, css-syntax + , fontconfig-pure, gl, GLUT, harfbuzz-pure, hspec, QuickCheck + , scientific, stylist-traits, text, xml + }: + mkDerivation { + pname = "cattrap"; + version = "0.1.0.0"; + sha256 = "0qp9lpq95a967yvdnzbdy5jzd6v0pvrr43v244fh4rkr5gh11j11"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + balkon base bytestring containers css-syntax fontconfig-pure + harfbuzz-pure scientific stylist-traits text + ]; + executableHaskellDepends = [ + base css-syntax gl GLUT stylist-traits text xml + ]; + testHaskellDepends = [ + base css-syntax hspec QuickCheck stylist-traits + ]; + description = "Lays out boxes according to the CSS Box Model"; + license = lib.licenses.gpl3Only; + mainProgram = "cattrap"; + }) {}; + "cautious" = callPackage ({ mkDerivation, aeson, base, transformers, validity }: mkDerivation { @@ -71906,8 +72006,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "8"; - editedCabalFile = "09fj4nghk80l8pqxjiddw0v8frwg46v5izkjsx2jvk1ksh6cif2b"; + revision = "9"; + editedCabalFile = "0039frsfxhs50rnixiq8kmfw91ar9qigmkzz0wrpds6xvr47ri53"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -75889,6 +75989,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "data-forced" = callPackage + ({ mkDerivation, base, containers, data-elevator, deepseq, HUnit }: + mkDerivation { + pname = "data-forced"; + version = "0.1.0.0"; + sha256 = "0njxf6g2lrpbh8vvc3iga7q216nfvxvf23vn9rbl6c7g0kj22112"; + revision = "1"; + editedCabalFile = "0fhgp6d9ipncmxqymz4isy2id98da1lcvbkpy828mm5dqchnwchf"; + libraryHaskellDepends = [ base data-elevator deepseq ]; + testHaskellDepends = [ base containers HUnit ]; + description = "Specify that lifted values were forced to WHNF or NF"; + license = lib.licenses.mit; + }) {}; + "data-forest" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -84843,6 +84957,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "dlist-nonempty_0_1_3" = callPackage + ({ mkDerivation, base, base-compat, Cabal, criterion, deepseq + , dlist, dlist-instances, foldable1-classes-compat, QuickCheck + , quickcheck-instances, semigroupoids + }: + mkDerivation { + pname = "dlist-nonempty"; + version = "0.1.3"; + sha256 = "0iypfrnjj9qaiv1xicr310jcham5kym4yr6myy6vbi8nbgwl82kp"; + libraryHaskellDepends = [ + base deepseq dlist foldable1-classes-compat semigroupoids + ]; + testHaskellDepends = [ + base Cabal QuickCheck quickcheck-instances + ]; + benchmarkHaskellDepends = [ + base base-compat criterion dlist dlist-instances + ]; + description = "Non-empty difference lists"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dmc" = callPackage ({ mkDerivation, base, hspec, process, QuickCheck }: mkDerivation { @@ -98407,13 +98544,14 @@ self: { , bytestring, config-ini, copr-api, directory, email-validate , extra, fedora-dists, filepath, http-conduit, http-directory , http-query, koji, network-uri, pagure, pretty-terminal, process - , rpm-nvr, rpmbuild-order, simple-cmd, simple-cmd-args, text, time - , typed-process, unix, utf8-string, xdg-basedir + , rpm-nvr, rpmbuild-order, simple-cmd, simple-cmd-args + , simple-prompt, text, time, typed-process, unix, utf8-string + , xdg-basedir }: mkDerivation { pname = "fbrnch"; - version = "1.2.1"; - sha256 = "1kf3sc5lcg9w62q18fzf3pgm0rhiyr290wad6l6932yjijxamaj2"; + version = "1.3.1"; + sha256 = "0rg9mlk999rch4a6v48bb8yvdmkfqmnh9q70j7jn6bnwl0hl0v0w"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -98421,8 +98559,8 @@ self: { copr-api directory email-validate extra fedora-dists filepath http-conduit http-directory http-query koji network-uri pagure pretty-terminal process rpm-nvr rpmbuild-order simple-cmd - simple-cmd-args text time typed-process unix utf8-string - xdg-basedir + simple-cmd-args simple-prompt text time typed-process unix + utf8-string xdg-basedir ]; description = "Fedora packager tool to build package branches"; license = lib.licenses.gpl2Only; @@ -98524,20 +98662,20 @@ self: { "fcf-containers" = callPackage ({ mkDerivation, base, containers, doctest, first-class-families - , ghc-prim, mtl, text + , ghc-prim, hspec, text }: mkDerivation { pname = "fcf-containers"; - version = "0.8.0"; - sha256 = "1j6xisy2xs5vfbl9ycmaqdzbys56k0nhwgzs8nx9qz6sik08r8s8"; + version = "0.8.1"; + sha256 = "1jrr4hs9cv3226n7gflvmmj26xvq148ma4y2wxjgv8zhkrprys53"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers first-class-families ghc-prim mtl text + base containers first-class-families ghc-prim text ]; executableHaskellDepends = [ base first-class-families ]; testHaskellDepends = [ - base containers doctest first-class-families ghc-prim text + base containers doctest first-class-families ghc-prim hspec text ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; @@ -99937,6 +100075,8 @@ self: { pname = "file-embed-lzma"; version = "0.0.1"; sha256 = "19l1gdjhsn4zh96mzbjsa5rn0acwrx1w3jy25cm23xv6jl8z28i9"; + revision = "1"; + editedCabalFile = "1zhbka04bbb7y1bslnxf8p145dwc48m3jmk5gighky8smjrzjjzr"; libraryHaskellDepends = [ base bytestring directory filepath lzma template-haskell text transformers @@ -101660,6 +101800,28 @@ self: { broken = true; }) {}; + "flag" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "flag"; + version = "0.1.0.0"; + sha256 = "0hpvh8x0b1dymm1vxfvy6903f0giaad2sdkbabivvkdcl1sf2x9g"; + libraryHaskellDepends = [ base ]; + description = "A simple flag type"; + license = lib.licenses.mit; + }) {}; + + "flag-dhall-instance" = callPackage + ({ mkDerivation, base, dhall, flag }: + mkDerivation { + pname = "flag-dhall-instance"; + version = "0.1.0.1"; + sha256 = "0zrrn6kbv28m7203icaqpns7ms4lfmgs02yq67i70k29x44z05an"; + libraryHaskellDepends = [ base dhall flag ]; + description = "FromDhall and ToDhall instances for flag"; + license = lib.licenses.mit; + }) {}; + "flags-applicative" = callPackage ({ mkDerivation, base, casing, containers, hspec, mtl, network , text @@ -103882,8 +104044,8 @@ self: { }: mkDerivation { pname = "forms-data-format"; - version = "0.1"; - sha256 = "1nal27zwibp4qc2p6gskrk9lvd78g8vaz5y168x7mnwjz3bhng8k"; + version = "0.2"; + sha256 = "0p62p9crw6aq1b4zd8p89i68mv4ghbrqryvi3r0gbjnsiq4agfw8"; libraryHaskellDepends = [ base bytestring grammatical-parsers monoid-subclasses parsers rank2classes text @@ -106679,8 +106841,8 @@ self: { pname = "functor-classes-compat"; version = "2.0.0.2"; sha256 = "02jamibwyr8hvf432m761v94xmwhbflrp6hd01jyv7fm95f5ki6h"; - revision = "1"; - editedCabalFile = "1yiw8wsxyvadbdbhv8r9h1m130lvgdgvz1v7lmga8pcg7brfagz8"; + revision = "2"; + editedCabalFile = "1vzh1hwg815pv64nbv8hvwbb91qg0fbq2xkdrn0d1m6li2h5k6q7"; libraryHaskellDepends = [ base containers ]; description = "Data.Functor.Classes instances for core packages"; license = lib.licenses.bsd3; @@ -109199,8 +109361,8 @@ self: { pname = "generic-lens-lite"; version = "0.1"; sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; - revision = "4"; - editedCabalFile = "1aw808ifylrwjpsf754gzq4npmh7c872cy2fsm7r2gpjgk7mkpp6"; + revision = "5"; + editedCabalFile = "1mc7fp8z1zm4k7kl7d4abq73zfkzf19hdviq0gqzgcigyskj97zq"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -109308,8 +109470,8 @@ self: { pname = "generic-optics-lite"; version = "0.1"; sha256 = "0vf5sk1narj69pdhjqxjj0w3w3i5lxjxn8p98xp8dj0jws4mx9xi"; - revision = "4"; - editedCabalFile = "1k5lkdzzdqq743bcw0shhwxj2i7ywh7rihdgasy543i5mvcp0cr4"; + revision = "5"; + editedCabalFile = "13ywf3smi7g7yz1pp8afb95dy4x6qq4kvll7chm4bnjl7s3d85kg"; libraryHaskellDepends = [ base generic-lens-lite optics-core ]; testHaskellDepends = [ base optics-core ]; description = "Monomorphic field opics like with generic-lens"; @@ -111305,8 +111467,8 @@ self: { }: mkDerivation { pname = "ghc-debug-brick"; - version = "0.4.0.0"; - sha256 = "1xdk23pzfa7q74rrxw26n47ki7iawysnf9liq6r9m92vll7nmq6y"; + version = "0.4.0.1"; + sha256 = "0qnx34yasr0f0bwpnm1qsybxp5aqjfhrhxxzr0477rhz5simnbys"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111329,8 +111491,8 @@ self: { }: mkDerivation { pname = "ghc-debug-client"; - version = "0.4.0.0"; - sha256 = "0r007lp3vpphcfzlv8p6k2w8r4f65if0kdh990d3pfj4m84xg81i"; + version = "0.4.0.1"; + sha256 = "0yfcl2hz9pzbyavp6xc08my1q37cngdqq85bdf4d1xkb5hvschib"; libraryHaskellDepends = [ async base binary bitwise bytestring containers contra-tracer directory dom-lt eventlog2html filepath ghc-debug-common @@ -111499,14 +111661,14 @@ self: { mainProgram = "ghc-events"; }) {}; - "ghc-events_0_19_0" = callPackage + "ghc-events_0_19_0_1" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers, text , vector }: mkDerivation { pname = "ghc-events"; - version = "0.19.0"; - sha256 = "034wy6rb51xi0avkcn1gy4sj6yf479hwd8y0zxrhqp4y7wb7bjx5"; + version = "0.19.0.1"; + sha256 = "1rliryx527ph1csyq8d5np1g8yfwhmsarspqnl7lp9d9nf0jkbn1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -112951,8 +113113,8 @@ self: { }: mkDerivation { pname = "ghci-dap"; - version = "0.0.20.0"; - sha256 = "11jzlvv48fvp87p2rkz3rab0707fb3yq0lz1146zh44adpkgf5vb"; + version = "0.0.21.0"; + sha256 = "0ws7rm0flw9mgajnr2m017xjj8lg0564q46p9rl98sa50nl91g6h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124247,8 +124409,8 @@ self: { }: mkDerivation { pname = "h-raylib"; - version = "4.6.0.1"; - sha256 = "0g2qz92h3kyp39yriji9v58sjgbhl5762fgkwpjx11k4jfrrpx52"; + version = "4.6.0.2"; + sha256 = "0c6qr5jrn327phaksib176aclz1ajs3z155nzn5pbd3gsln1g9jp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; @@ -125429,6 +125591,26 @@ self: { maintainers = [ lib.maintainers.sternenseemann ]; }) {}; + "hackage-db_2_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, exceptions, filepath, tar, time, utf8-string + }: + mkDerivation { + pname = "hackage-db"; + version = "2.1.3"; + sha256 = "1rzpw9xwg587i0ry92ny2yad94lk1x57dx3sd12my9nqj04v2zvb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory exceptions + filepath tar time utf8-string + ]; + description = "Access cabal-install's Hackage database via Data.Map"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.sternenseemann ]; + }) {}; + "hackage-diff" = callPackage ({ mkDerivation, ansi-terminal, async, attoparsec, base, Cabal , cpphs, directory, filepath, haskell-src-exts, HTTP, mtl, process @@ -129949,18 +130131,19 @@ self: { "haskanoid" = callPackage ({ mkDerivation, base, freenect, hcwiid, IfElse, MissingH, mtl, SDL - , SDL-image, SDL-mixer, SDL-ttf, transformers, vector, Yampa + , SDL-image, SDL-mixer, SDL-ttf, simple-affine-space, transformers + , vector, Yampa }: mkDerivation { pname = "haskanoid"; - version = "0.1.5.4"; - sha256 = "01cwjvs1sj66w9siqfq3vzrw5607bh2pxr6zzx64jhqhcr3yv73d"; + version = "0.1.6"; + sha256 = "0nvlrm8qn8zh8cjfmd88x8f8ikrr8axq0dl3fw3ag35yp8vn84gc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer - SDL-ttf transformers vector Yampa + SDL-ttf simple-affine-space transformers vector Yampa ]; description = "A breakout game written in Yampa using SDL"; license = "unknown"; @@ -130548,8 +130731,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.38.0"; - sha256 = "14qqxyrj31j5jm3q467msl76srx0nvhpid9zjqy6qqq8bf7klhrm"; + version = "0.0.39.0"; + sha256 = "0pk578m0v8i1504g3kr8mk5pq5nrkdvj46n8k0fyivdvxc3zypx0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137257,6 +137440,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.5.4"; sha256 = "0z9ik5asddc2pnz430jsi1pyahkh6jy36ng0vwm7ywcq7cvhcvlz"; + revision = "1"; + editedCabalFile = "06d6wjpg2dqip714az5w01kgz3rl4w8i61l09fb4mx79a43y6pa5"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -137287,8 +137472,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.4.0.1"; - sha256 = "05skqhcf51dv6g171vq29pca48n0hbnl8b5xrzalr77a19s77ba3"; + version = "0.4.1.0"; + sha256 = "10qdca2pfxmk2fgnipdxxm1sh8a5dk1hb0b8f924gsfbd0pl2q4d"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq directory exceptions filepath hedgehog hw-aeson mmorph mtl network process @@ -141162,6 +141347,8 @@ self: { pname = "hindent"; version = "5.3.4"; sha256 = "1pc20iza3v0ljzbx6cycm1j1kbmz8h95xwfq47fd6zfmsrx9w6vn"; + revision = "1"; + editedCabalFile = "0rs5pk858dnc8jw1h9w8zk94jl3n79j5ci3jcq9gyghpwy6bfn6p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -142112,21 +142299,21 @@ self: { }) {}; "hix" = callPackage - ({ mkDerivation, aeson, base, Cabal, exon, extra, filepattern - , generic-lens, hedgehog, incipit-base, lens, lens-regex-pcre - , optparse-applicative, path, path-io, random, tasty - , tasty-hedgehog, transformers, unix + ({ mkDerivation, aeson, base, Cabal, casing, exon, extra + , filepattern, generic-lens, hedgehog, incipit-base, lens + , lens-regex-pcre, optparse-applicative, path, path-io, random + , tasty, tasty-hedgehog, transformers, unix }: mkDerivation { pname = "hix"; - version = "0.1.1.0"; - sha256 = "0ch2y8axhln64q0cggcrdi4fajxadlv0ibw7gmjdi93ish9hvk48"; + version = "0.4.2"; + sha256 = "0fyqxdz2qgkn03a4db5f5v6x56wi61bcmchcdxj4s1hgysvjzfzp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base Cabal exon extra filepattern generic-lens incipit-base - lens lens-regex-pcre optparse-applicative path path-io random - transformers unix + aeson base Cabal casing exon extra filepattern generic-lens + incipit-base lens lens-regex-pcre optparse-applicative path path-io + random transformers unix ]; executableHaskellDepends = [ base incipit-base ]; testHaskellDepends = [ @@ -142643,7 +142830,7 @@ self: { ]; }) {}; - "hledger_1_29_1" = callPackage + "hledger_1_29_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, data-default, Decimal, Diff, directory, extra , filepath, githash, hashable, haskeline, hledger-lib, lucid @@ -142654,8 +142841,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.29.1"; - sha256 = "0zzjn9s48ykgy69c6zlb2qdsvvgnr566ma34v6dx78zsxfkyh7i5"; + version = "1.29.2"; + sha256 = "0q6l7mk0x8f0p0gjb3fgvm73xspp7ls1pac9a45yqaivblqxm0kr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142893,7 +143080,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "hledger-lib_1_29_1" = callPackage + "hledger-lib_1_29_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat, blaze-markup, bytestring, call-stack, cassava , cassava-megaparsec, cmdargs, colour, containers, data-default @@ -142906,8 +143093,8 @@ self: { }: mkDerivation { pname = "hledger-lib"; - version = "1.29.1"; - sha256 = "18n9aa7pmrc5a1kycg0n3vs8jc1m4msn9r6i91ywhnjimlna686c"; + version = "1.29.2"; + sha256 = "0nyc32prc4s0v4fi6m8s0r2dnk15cf5xgdwm7mpy3mmij83pjyym"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat blaze-markup bytestring call-stack cassava cassava-megaparsec @@ -143010,7 +143197,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-ui_1_29_1" = callPackage + "hledger-ui_1_29_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, brick, cmdargs , containers, data-default, directory, doclayout, extra, filepath , fsnotify, hledger, hledger-lib, megaparsec, microlens @@ -143019,8 +143206,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.29.1"; - sha256 = "0fr13hrnpw0wh03gas37bda52hizpw2xv2sn2gf3i9blfh08bcgm"; + version = "1.29.2"; + sha256 = "1q9k44gzgls6yzn9nv9mlg4xzr1mc7dy64p1bkykr8f9z20ljh8r"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143093,7 +143280,7 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hledger-web_1_29_1" = callPackage + "hledger-web_1_29_2" = callPackage ({ mkDerivation, aeson, base, base64, blaze-html, blaze-markup , bytestring, case-insensitive, clientsession, cmdargs, conduit , conduit-extra, containers, data-default, Decimal, directory @@ -143106,8 +143293,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.29.1"; - sha256 = "0d4gdxlqhkxwd9dppdbw2xp332c5vk0iq0xasr9myifvivi88v4a"; + version = "1.29.2"; + sha256 = "16q5jxd7dpr3rqklgd9v73ilpbz2075nzlhk0hdciw9sarq6jc0y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148005,10 +148192,16 @@ self: { }: mkDerivation { pname = "hprox"; - version = "0.2.0"; - sha256 = "1c8cqakxixv8dz85ysbl9w017k9b941hai9jjfw4gj8mlcvhzl12"; - isLibrary = false; + version = "0.3.0"; + sha256 = "081bzqbwgj6z17k41l8akxi9xl63n539g8xz54f711cv4fza5jdl"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + async base base64-bytestring binary bytestring case-insensitive + conduit conduit-extra dns http-client http-client-tls + http-reverse-proxy http-types optparse-applicative tls unix wai + wai-extra warp warp-tls + ]; executableHaskellDepends = [ async base base64-bytestring binary bytestring case-insensitive conduit conduit-extra dns http-client http-client-tls @@ -162684,6 +162877,30 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "incremental-parser_0_5_0_5" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , input-parsers, monoid-subclasses, parsers, QuickCheck + , rank2classes, tasty, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.5.0.5"; + sha256 = "1hxw7an7ysdhjn2alkv4li3wc9wf56aff1jnkkkvfivjhv0i482c"; + libraryHaskellDepends = [ + base input-parsers monoid-subclasses parsers rank2classes + transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -165668,8 +165885,8 @@ self: { }: mkDerivation { pname = "ip2location"; - version = "8.4.0"; - sha256 = "0004hfjvy5dcvvphiarswpy7vnl4lip25qbc662l6vjia0wwn95x"; + version = "8.5.0"; + sha256 = "1r2p6qv2n5pq4c9vr3zq6gkp7si7jm498fchqynrcnslldghz70c"; libraryHaskellDepends = [ aeson base binary bytestring http-client http-client-tls http-types iproute split uri-encode @@ -171317,8 +171534,8 @@ self: { pname = "kansas-comet"; version = "0.4.1"; sha256 = "1j54rsqna8xrw1si8i74v0c9k4jjv8a2q001aa8sx4rxb7d1qbzy"; - revision = "4"; - editedCabalFile = "0csspj6l6wa7kf6npxx5sg6mzhawv9ajd99lnpp71bgxrf9axlsz"; + revision = "5"; + editedCabalFile = "0mw1667kpzg84q5iwdk90nq1n87i46zp9w0wgk9y0znwhbqw7hsw"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time @@ -172685,35 +172902,37 @@ self: { "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, containers, directory, filepath, fsnotify - , http-client, http-conduit, http-reverse-proxy, http-types, HUnit - , indexed-traversable, lens, lifted-base, mtl, network - , optparse-applicative, process, random, regex-tdfa, stm, tar - , tasty, tasty-hunit, template-haskell, text, time, tls - , tls-session-manager, transformers, unix, unix-compat - , unordered-containers, vector, wai, wai-app-static, wai-extra - , warp, warp-tls, wreq, yaml, zlib + , conduit-extra, containers, directory, fast-logger, filepath + , fsnotify, http-client, http-conduit, http-reverse-proxy + , http-types, HUnit, indexed-traversable, lens, lifted-base + , monad-logger, mtl, network, optparse-applicative, process, random + , regex-tdfa, stm, tar, tasty, tasty-hunit, template-haskell, text + , time, tls, tls-session-manager, transformers, unix, unix-compat + , unliftio-core, unordered-containers, vector, wai, wai-app-static + , wai-extra, warp, warp-tls, wreq, yaml, zlib }: mkDerivation { pname = "keter"; - version = "2.0.1"; - sha256 = "1vi1vilc7j34rk5bsgixh7gx7cd3grc7ykl2yrkvzswrx2s3c3fg"; + version = "2.1.0"; + sha256 = "1yfql7cb8xmny52gid5zbav96b7j0cys3fgcxy5qg8scgs5ri43v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async attoparsec base blaze-builder bytestring case-insensitive conduit conduit-extra containers directory - filepath fsnotify http-client http-conduit http-reverse-proxy - http-types indexed-traversable lifted-base mtl network - optparse-applicative process random regex-tdfa stm tar - template-haskell text time tls tls-session-manager transformers - unix unix-compat unordered-containers vector wai wai-app-static - wai-extra warp warp-tls yaml zlib + fast-logger filepath fsnotify http-client http-conduit + http-reverse-proxy http-types indexed-traversable lifted-base + monad-logger mtl network optparse-applicative process random + regex-tdfa stm tar template-haskell text time tls + tls-session-manager transformers unix unix-compat unliftio-core + unordered-containers vector wai wai-app-static wai-extra warp + warp-tls yaml zlib ]; executableHaskellDepends = [ base filepath ]; testHaskellDepends = [ base bytestring conduit http-client http-conduit http-types HUnit - lens stm tasty tasty-hunit transformers unix wai warp wreq + lens monad-logger mtl stm tasty tasty-hunit transformers unix wai + warp wreq ]; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = lib.licenses.mit; @@ -173356,8 +173575,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "kind-integer"; - version = "0.4"; - sha256 = "0r8bqrj8cb0gc5rvmc8ilzxb6f6giw8ng2n7zj8qcda8drcy51m2"; + version = "0.5"; + sha256 = "08xc905lhpxyimr6g4lk88z6w03bs7wqhamgggchvn63j9yk8pln"; libraryHaskellDepends = [ base singletons ]; testHaskellDepends = [ base ]; description = "Type-level integers. Like KnownNat, but for integers."; @@ -173370,8 +173589,8 @@ self: { ({ mkDerivation, base, kind-integer, singletons }: mkDerivation { pname = "kind-rational"; - version = "0.3"; - sha256 = "05gd6j4vrd0q1am3bcmwbn4frgwmdyz0iyv3spra4z05v5ixk454"; + version = "0.4"; + sha256 = "070jks3hwn59f9bm0y0fllyzx0qbps4i5bh96rnjnq3x8xlf3ad1"; libraryHaskellDepends = [ base kind-integer singletons ]; testHaskellDepends = [ base kind-integer singletons ]; description = "Type-level rationals. Like KnownNat, but for rationals."; @@ -174078,8 +174297,8 @@ self: { }: mkDerivation { pname = "ktx-codec"; - version = "0.0.2.0"; - sha256 = "1d8mxs7qh558fb53gfs6rl0m073951zijgwanvc4gylvxcw3jyc6"; + version = "0.0.2.1"; + sha256 = "0cigkpvgx12py0i942sci359xsj87pa0bhgmmamhigynimbfspzr"; libraryHaskellDepends = [ base binary bytestring containers text vector ]; @@ -176851,6 +177070,8 @@ self: { pname = "language-sygus"; version = "0.1.1.3"; sha256 = "15xxagcsqjchng2nr1qg6ncqch5l74m62iv58pgkcqhzqqhf3fwg"; + revision = "2"; + editedCabalFile = "0b1hlcj00rz1jlnfkp1wz6lsbkmahb07m6h7rbsmx3g1bqsp2j7s"; libraryHaskellDepends = [ array base hashable text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base deepseq tasty tasty-hunit text ]; @@ -181445,8 +181666,8 @@ self: { }: mkDerivation { pname = "lima"; - version = "0.2.0.0"; - sha256 = "0amfvmp5z4824w6bpc49cnayr42fdwqbx0p5pvpva7lrj27pbskr"; + version = "0.2.1.1"; + sha256 = "1q8xjgsnpfcxarz08m6kl10mjg3ik7qyrvdvgz34xwd6s90x2x3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186622,6 +186843,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "lucid_2_11_20230408" = callPackage + ({ mkDerivation, base, bifunctors, blaze-builder, bytestring + , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph + , mtl, parsec, text, transformers + }: + mkDerivation { + pname = "lucid"; + version = "2.11.20230408"; + sha256 = "07a41xkql96hkp9jawlaxn0lflvjf8a2djb45k3b3ig9zs82j48g"; + libraryHaskellDepends = [ + base blaze-builder bytestring containers hashable mmorph mtl text + transformers + ]; + testHaskellDepends = [ + base bifunctors hspec HUnit mtl parsec text + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq text transformers + ]; + description = "Clear to write, read and edit DSL for HTML"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lucid-alpine" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -187317,6 +187562,24 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) xz;}; + "lzma_0_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, HUnit, liblzma, QuickCheck + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "lzma"; + version = "0.0.1.0"; + sha256 = "0knz0d6456zf6wbqifzcsw2xvdgaqnig2zn96kav7aqn5i4nfbvj"; + libraryHaskellDepends = [ base bytestring ]; + libraryPkgconfigDepends = [ liblzma ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "LZMA/XZ compression and decompression"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {liblzma = null;}; + "lzma-clib" = callPackage ({ mkDerivation }: mkDerivation { @@ -198227,18 +198490,19 @@ self: { }) {inherit (pkgs) glew;}; "monomer-flatpak-example" = callPackage - ({ mkDerivation, base, containers, directory, monomer - , monomer-hagrid, text + ({ mkDerivation, base, containers, data-default-class, dbus + , directory, monomer, monomer-hagrid, random, text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.4.0"; - sha256 = "0k7kyfr23bskfigzbjnlzkyrhn8r1z663zhi5rl22p2l4xq7alv3"; + version = "0.0.5.1"; + sha256 = "0lg35nlznzj4dpckxdwfbbc0ymd4s0finrlff56wwrb848dn433y"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base containers directory monomer monomer-hagrid text + base containers data-default-class dbus directory monomer + monomer-hagrid random text ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; @@ -198371,8 +198635,8 @@ self: { pname = "months"; version = "0.2"; sha256 = "054dag7806850hdii7s5rxg8gx2spdp33pnx4s4ckni9ayvspija"; - revision = "6"; - editedCabalFile = "05h58b9cg1iy9l4lh1xf35ngjh9cpwiibprbbsmjl0gw9d0a32p9"; + revision = "7"; + editedCabalFile = "0134xrfqbxzd0l09g12rmpcawjghl7yxpc3yzdxpdhakyvkw2s0b"; libraryHaskellDepends = [ aeson attoparsec base base-compat deepseq hashable intervals QuickCheck text time-compat @@ -212046,8 +212310,8 @@ self: { }: mkDerivation { pname = "oops"; - version = "0.2.0.0"; - sha256 = "0kqgilshjd0lrabfb4yllgqk93kyyy62h7igpyz48wvz0x9mvy3d"; + version = "0.2.0.1"; + sha256 = "0n5n9503kx5scpkync4mya80arqh3q4y96pi9b3bql3r33kxnzg2"; libraryHaskellDepends = [ base exceptions mtl QuickCheck transformers ]; @@ -212061,6 +212325,19 @@ self: { license = lib.licenses.mit; }) {}; + "oops-examples" = callPackage + ({ mkDerivation, base, exceptions, mtl, oops, text, transformers }: + mkDerivation { + pname = "oops-examples"; + version = "0.2.0.0"; + sha256 = "13day3xbabqnda6lvj5x3hk77qr89gzf0d753s33y47dlh1q6i6v"; + libraryHaskellDepends = [ + base exceptions mtl oops text transformers + ]; + description = "Oops examples"; + license = lib.licenses.mit; + }) {}; + "op" = callPackage ({ mkDerivation, base, containers, doctest }: mkDerivation { @@ -217308,7 +217585,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_8_1" = callPackage + "pantry_0_8_2_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -217322,10 +217599,10 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.8.1"; - sha256 = "01vd0k21mjaj59sjj4jpada3gd112vsjaba962xrp9v9zw2wmzh8"; - revision = "1"; - editedCabalFile = "1cri06daxrm4f872rn7xp3i9smknxwm9100iy4hxjkrqss5z6sc0"; + version = "0.8.2.1"; + sha256 = "08cxhg5whfyk1nn45yh07j0d70c7aigaspzl84jxaz3swqn7z3al"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -222982,6 +223259,18 @@ self: { broken = true; }) {}; + "pgvector" = callPackage + ({ mkDerivation, base, bytestring, postgresql-simple }: + mkDerivation { + pname = "pgvector"; + version = "0.1.0"; + sha256 = "0cpqcq0ly02i8njrgihh1rf0kvmfpa6clh2hx24ym7rz561ai1ms"; + libraryHaskellDepends = [ base bytestring postgresql-simple ]; + testHaskellDepends = [ base postgresql-simple ]; + description = "pgvector support for Haskell"; + license = lib.licenses.mit; + }) {}; + "phantom-state" = callPackage ({ mkDerivation, base, criterion, transformers, vector }: mkDerivation { @@ -224853,8 +225142,8 @@ self: { pname = "pipes-bytestring"; version = "2.1.7"; sha256 = "0ch7145pv4f56601ysdj5gqqwsh5ag2zh34ydswg62fqi8z8cxvc"; - revision = "1"; - editedCabalFile = "09f3cavs592wwasiqr1sj09a1lkvksskv8cs0zhxj8nbf3jk3gqw"; + revision = "2"; + editedCabalFile = "0nvb4y5s0jrm4v5a3hvxabjlb16xdlivlh0qrqpl4fi1gih1x4yb"; libraryHaskellDepends = [ base bytestring pipes pipes-group pipes-parse stringsearch transformers @@ -225231,8 +225520,8 @@ self: { pname = "pipes-group"; version = "1.0.12"; sha256 = "1issfj3syi6lfbcdn3bhlbnlh86s92ldsb04c4ac69xipsgyhwqk"; - revision = "8"; - editedCabalFile = "1mfqws43yrdbmq3az04n7z5hs2g4l57p48dqbfp1vi4d7nk97dw5"; + revision = "9"; + editedCabalFile = "1i0l182q4gxq29g5w8iv3ywq68dq3gcyhjybfrih0q0cnyz8zxlc"; libraryHaskellDepends = [ base free pipes pipes-parse transformers ]; @@ -225523,8 +225812,8 @@ self: { pname = "pipes-parse"; version = "3.0.9"; sha256 = "05cd0j1avkzmryf3869hfpvd9xmzbpz4kc65srswx36n06dkz5x3"; - revision = "1"; - editedCabalFile = "1pg7hpk6ny6jxciw58pmn03dip31ll5wxyf8b0s1x22kzfc40fsr"; + revision = "2"; + editedCabalFile = "0dil8dqjx4l1d065rcixhbri1j40ppip6kfl22kxgyx96hz0vzfh"; libraryHaskellDepends = [ base pipes transformers ]; description = "Parsing infrastructure for the pipes ecosystem"; license = lib.licenses.bsd3; @@ -225647,8 +225936,8 @@ self: { pname = "pipes-safe"; version = "2.3.4"; sha256 = "1ha0q1dwl52rn59shmk8jhp7grngpiwmp8x4qa9h54flvxkqk12x"; - revision = "4"; - editedCabalFile = "1p55qgg0ib05rvcrwpcnrg8dl0plaj9hkl6s7d47krlpmr8qsdx8"; + revision = "5"; + editedCabalFile = "0mh22g35wl0ri8fysyvk30qwkr9i7lynllwhg2z530lrsxqyfjqy"; libraryHaskellDepends = [ base containers exceptions monad-control mtl pipes primitive transformers transformers-base @@ -227807,7 +228096,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "polysemy_1_9_0_0" = callPackage + "polysemy_1_9_1_0" = callPackage ({ mkDerivation, async, base, Cabal, cabal-doctest, containers , doctest, first-class-families, hspec, hspec-discover , inspection-testing, mtl, stm, syb, template-haskell @@ -227815,8 +228104,8 @@ self: { }: mkDerivation { pname = "polysemy"; - version = "1.9.0.0"; - sha256 = "00qmsn0mr88y29my389ln6c5imcac73p7hisd102w4qlwikwj9ir"; + version = "1.9.1.0"; + sha256 = "0jqxxnsmlhjvdfwplvw4m6y6a04glsgmrdhnrjfcvj4mvla48cvv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ async base containers first-class-families mtl stm syb @@ -228362,6 +228651,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "polysemy-plugin_0_4_5_0" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest + , ghc, ghc-tcplugins-extra, hspec, hspec-discover + , inspection-testing, polysemy, should-not-typecheck, syb + , transformers + }: + mkDerivation { + pname = "polysemy-plugin"; + version = "0.4.5.0"; + sha256 = "1q06276pqw1zm4x5hq0ax7ia12d32cajvhwpmx2nwqj5yh7jyygh"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra polysemy syb transformers + ]; + testHaskellDepends = [ + base containers doctest ghc ghc-tcplugins-extra hspec + hspec-discover inspection-testing polysemy should-not-typecheck syb + transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Disambiguate obvious uses of effects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-process" = callPackage ({ mkDerivation, base, incipit-core, path, path-io, polysemy , polysemy-conc, polysemy-plugin, polysemy-resume, polysemy-test @@ -230329,6 +230643,8 @@ self: { pname = "postgresql-simple"; version = "0.6.5"; sha256 = "15jy8lp9200whyxk421yw3m671cjz41cnv2j8wll1giblyr3m9gx"; + revision = "1"; + editedCabalFile = "0yiqbac742vyhnd9kz390amkfa1dshqm76hf9nsam27cq7h7m7i5"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -233950,6 +234266,8 @@ self: { pname = "profiteur"; version = "0.4.6.1"; sha256 = "1a8li2wkr2af1d5ddpprxzjs7m2j7ii30k7j93a22isfqmywhhbb"; + revision = "1"; + editedCabalFile = "1jhh1rz5i4mwhxhlc6zcv94qy9khyk3fjdf7cfbwivw1pylwgji1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -235002,6 +235320,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens_0_7_1_3" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim + , lens-family, parsec, pretty, primitive, profunctors, QuickCheck + , tagged, tasty, tasty-quickcheck, text, transformers, vector + }: + mkDerivation { + pname = "proto-lens"; + version = "0.7.1.3"; + sha256 = "1b73pa5vs5bhzaf2njhv8idw8i76fm7mq2qjrdv5y7d3f5v33i5a"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim lens-family parsec + pretty primitive profunctors tagged text transformers vector + ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-quickcheck vector + ]; + description = "A lens-based implementation of protocol buffers in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-arbitrary" = callPackage ({ mkDerivation, base, bytestring, containers, lens-family , proto-lens, QuickCheck, text @@ -235086,6 +235426,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-optparse_0_1_1_10" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.1.10"; + sha256 = "0w79ybb5vk7l7c2z5n5b9m6sp56xgabikwpwn64l4x35ird167zh"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, lens-family, proto-lens , proto-lens-protoc, proto-lens-runtime, proto-lens-setup, protobuf @@ -235142,6 +235496,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "proto-lens-runtime_0_7_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, filepath + , lens-family, proto-lens, text, vector + }: + mkDerivation { + pname = "proto-lens-runtime"; + version = "0.7.0.4"; + sha256 = "0ivzb19fxydn3i5inpjvnvj4ghfwiakhp0wqasp6pmbzv40wsjap"; + libraryHaskellDepends = [ + base bytestring containers deepseq filepath lens-family proto-lens + text vector + ]; + doHaddock = false; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "proto-lens-setup" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, deepseq , directory, filepath, process, proto-lens-protoc, temporary, text @@ -247649,8 +248020,8 @@ self: { pname = "rere"; version = "0.2"; sha256 = "0s89flhcmwppypxz909ifmzq7vlwy35yjrbw0gkgm4ikbw6l1ylr"; - revision = "2"; - editedCabalFile = "1gbf04s2rjs8kn1g28kd5qm8rvq6fdna88l1plw67q19v9rkxidp"; + revision = "3"; + editedCabalFile = "01d112sii06yz06lpw5i7q3v4gshha9f0d7vpdc0yj2v34f45crv"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -251658,17 +252029,18 @@ self: { }) {}; "rpmostree-update" = callPackage - ({ mkDerivation, base, directory, extra, filepath, simple-cmd - , simple-prompt, xdg-basedir + ({ mkDerivation, base, directory, extra, filepath, process + , simple-cmd, simple-prompt, xdg-basedir }: mkDerivation { pname = "rpmostree-update"; - version = "0.1.1"; - sha256 = "0qly1w32xrcq8wfbjca9b1v3waskzmjhidqp9v81fa8gng38y8h4"; + version = "0.1.2"; + sha256 = "16cdv918bj2by5afn441fizaxfprp55x2vgkvmfi7m3clicvmbl7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory extra filepath simple-cmd simple-prompt xdg-basedir + base directory extra filepath process simple-cmd simple-prompt + xdg-basedir ]; description = "rpm-ostree update wrapper that caches change info"; license = lib.licenses.bsd3; @@ -252437,8 +252809,8 @@ self: { }: mkDerivation { pname = "s-cargot"; - version = "0.1.5.0"; - sha256 = "06y2hrf6ncnf37w3g1gphfcqxsbln62jkpww8x5r0qq6f2cgj2z1"; + version = "0.1.6.0"; + sha256 = "078cyadilhsb8r0al6yrij5c8hnxycbrkwjbm7l5m05qpkw60v91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers parsec text ]; @@ -259203,6 +259575,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "servant-combinators" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, case-insensitive + , clientsession, containers, cookie, http-client, http-conduit + , http-types, QuickCheck, servant, servant-server, tasty + , tasty-quickcheck, text, time, vault, wai, warp + }: + mkDerivation { + pname = "servant-combinators"; + version = "0.0.1"; + sha256 = "0c9mybvik61nk5lvz4nfm6n48qsxqfaivrx3dczajiw9l7llpij6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring clientsession containers cookie http-types + QuickCheck servant servant-server tasty text time vault wai + ]; + executableHaskellDepends = [ + aeson base bytestring clientsession containers cookie http-types + QuickCheck servant servant-server tasty text time vault wai + ]; + testHaskellDepends = [ + aeson async base bytestring case-insensitive clientsession + containers cookie http-client http-conduit http-types QuickCheck + servant servant-server tasty tasty-quickcheck text time vault wai + warp + ]; + description = "Extra servant combinators for full WAI functionality"; + license = lib.licenses.mit; + mainProgram = "live-test"; + }) {}; + "servant-conduit" = callPackage ({ mkDerivation, base, base-compat, bytestring, conduit , http-client, http-media, mtl, resourcet, servant, servant-client @@ -271053,8 +271456,8 @@ self: { pname = "sop-core"; version = "0.5.0.2"; sha256 = "0rbj56icbaqlcxx5xwvbx4n4vmyv6cfcv7s45n1fv3drahigvgw7"; - revision = "1"; - editedCabalFile = "1p6zyqja021gyndskn1qnj29glqr0hldyhxplnpxz06hz4xqwngz"; + revision = "2"; + editedCabalFile = "0db36xhswrsc30cw5c5s7h6g1ykcb3bkjjnixaqqshxln6cwfsig"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = lib.licenses.bsd3; @@ -278033,18 +278436,20 @@ self: { "streamly-process" = callPackage ({ mkDerivation, base, directory, exceptions, hspec, process - , QuickCheck, streamly, tasty-bench, unix + , QuickCheck, streamly, streamly-core, tasty-bench }: mkDerivation { pname = "streamly-process"; - version = "0.2.0.1"; - sha256 = "1drzhkqdxxyxaymbx55p0nwy4yjf959i8gn1ap9m9jbjkf0w2l6l"; - libraryHaskellDepends = [ base exceptions process streamly unix ]; + version = "0.3.0"; + sha256 = "15vj47j9n723clsa29m293c1naagi8psf3n1a9rv69myb4yddjry"; + libraryHaskellDepends = [ + base exceptions process streamly streamly-core + ]; testHaskellDepends = [ - base directory exceptions hspec process QuickCheck streamly + base directory exceptions hspec QuickCheck streamly-core ]; benchmarkHaskellDepends = [ - base directory process streamly tasty-bench + base directory streamly-core tasty-bench ]; description = "Use OS processes as stream transformation functions"; license = lib.licenses.asl20; @@ -279433,8 +279838,8 @@ self: { pname = "structured"; version = "0.1.1"; sha256 = "1mz02ys85z79nj24ylsmgh8v2m7zv2rixf7w0iqnwc49lax52w4q"; - revision = "5"; - editedCabalFile = "1saljgwlag0ajhwqblvb459hw2m0n2dc9w3j50b069grbm6v8dr6"; + revision = "6"; + editedCabalFile = "0kbc1p5qv5n2fhammf0f879ndsgp083387bar1hmnc2xia6lzx8c"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers hashable scientific tagged text time-compat transformers @@ -281708,7 +282113,7 @@ self: { broken = true; }) {}; - "sydtest_0_14_0_0" = callPackage + "sydtest_0_15_0_0" = callPackage ({ mkDerivation, async, autodocodec, autodocodec-yaml, base , bytestring, containers, dlist, envparse, filepath, MonadRandom , mtl, optparse-applicative, path, path-io, pretty-show, QuickCheck @@ -281718,8 +282123,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.14.0.0"; - sha256 = "1pqzc1mir7pcpp5pdlz0qipn52ma9b86lgcdvagdqf30c8h5wdg9"; + version = "0.15.0.0"; + sha256 = "0yrijkdicdpw1b2h95xg61q5c95bz1i6f2m1s1pa07avzs6bmils"; libraryHaskellDepends = [ async autodocodec autodocodec-yaml base bytestring containers dlist envparse filepath MonadRandom mtl optparse-applicative path path-io @@ -286199,6 +286604,8 @@ self: { pname = "tasty-wai"; version = "0.1.2.0"; sha256 = "18yw2qzzg969c99rpa8p154hxbm9i4iq64pma3jkr2gfdm6j4vvg"; + revision = "1"; + editedCabalFile = "14pz0mvpy2vwdhapn68pmwrpq7pvky87mkph44bc6vcbqy1jnk5c"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -286468,6 +286875,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "tdigest_0_3" = callPackage + ({ mkDerivation, base, base-compat, binary, deepseq + , foldable1-classes-compat, reducers, semigroups, tasty + , tasty-quickcheck, transformers, vector, vector-algorithms + }: + mkDerivation { + pname = "tdigest"; + version = "0.3"; + sha256 = "02jdi827kxa8bn6gacdncmnggjw5f8wjf2i4idgf88kz564yd9bb"; + libraryHaskellDepends = [ + base base-compat binary deepseq foldable1-classes-compat reducers + transformers vector vector-algorithms + ]; + testHaskellDepends = [ + base base-compat binary deepseq semigroups tasty tasty-quickcheck + vector vector-algorithms + ]; + description = "On-line accumulation of rank-based statistics"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tdigest-Chart" = callPackage ({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour , lens, mwc-random, semigroupoids, statistics, tdigest, vector @@ -298329,8 +298758,8 @@ self: { }: mkDerivation { pname = "twain"; - version = "2.1.0.0"; - sha256 = "0ffppxfdrjgqr3csm2cwsc2sgxgrl9dqx60n2zffnh3c7qc7z749"; + version = "2.1.2.0"; + sha256 = "1hkzp2g671dagmv1qznkf3mw3l2mslckg7h0a8x8633h6i3j6br0"; libraryHaskellDepends = [ aeson base bytestring case-insensitive cookie either exceptions http-types http2 text time transformers vault wai wai-extra @@ -299267,6 +299696,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "type-errors_0_2_0_2" = callPackage + ({ mkDerivation, base, doctest, first-class-families, syb + , template-haskell, th-abstraction + }: + mkDerivation { + pname = "type-errors"; + version = "0.2.0.2"; + sha256 = "10vwi7ygwnrhw9vl0r3vx4p5dfwk7xkpd6aks6wdcwy53vfzyz39"; + revision = "1"; + editedCabalFile = "1ayzhw2dqswka0r8xwdjr2vbaf1angaj7zaqxa80lww2nlxv7mmg"; + libraryHaskellDepends = [ + base first-class-families syb template-haskell th-abstraction + ]; + testHaskellDepends = [ + base doctest first-class-families syb template-haskell + th-abstraction + ]; + description = "Tools for writing better type errors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "type-errors-pretty" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -307766,6 +308217,28 @@ self: { broken = true; }) {}; + "version-natural" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "version-natural"; + version = "0.1.0.0"; + sha256 = "0cwrpr50x0vcsp83zjwmjif812s9dp50a865g306dsv96g5pc1i8"; + libraryHaskellDepends = [ base text ]; + description = "A simple version type"; + license = lib.licenses.mit; + }) {}; + + "version-natural-dhall-instance" = callPackage + ({ mkDerivation, base, dhall, version-natural }: + mkDerivation { + pname = "version-natural-dhall-instance"; + version = "0.2.0.0"; + sha256 = "0nm8nnz1vsd3nyb3dsh591bayzg87xmxn2a9ms5zrld6dim909q6"; + libraryHaskellDepends = [ base dhall version-natural ]; + description = "FromDhall and ToDhall instances for version-natural"; + license = lib.licenses.mit; + }) {}; + "versioning" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, semigroupoids }: mkDerivation { @@ -319951,8 +320424,8 @@ self: { pname = "yampa-canvas"; version = "0.2.3"; sha256 = "0a1pq1psmc4490isr19z4prnqq1w3374vkfmzpw9s20s2p6k5y7r"; - revision = "9"; - editedCabalFile = "0cl5bnki5a5dfr6jv5957c7svvgnvgf5zr6c6adha639z98l1fmq"; + revision = "10"; + editedCabalFile = "1pamw58yr17csjj2ysy0wwx41dkvfdaxxn90k5q7rdb12rfvdyp4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blank-canvas stm time Yampa ]; @@ -319984,8 +320457,8 @@ self: { ({ mkDerivation, base, gloss, Yampa }: mkDerivation { pname = "yampa-gloss"; - version = "0.2"; - sha256 = "0dbp5a4mvqvdc6pq9qdaw3656n0pspmjjg5z4a1b5q8s6dbv62zx"; + version = "0.2.1"; + sha256 = "0af9ra2f9fznqndl292h8h8s4cs1rc31pqrkbfjf731z5sb482vm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gloss Yampa ]; @@ -320040,8 +320513,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.14.1"; - sha256 = "163kl1iqldlz3b429zbyvasgd7kkv7z0h3vkk753273xl6kfx0xr"; + version = "0.14.2"; + sha256 = "08j923m374jr3kv6jyfrq7kba8y7hcq80xw8a7mhkif0l8w2rgxa"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; From 35c00c639a2addcb3553437062fe8ced8ccf16d8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 13 Apr 2023 14:13:40 +0200 Subject: [PATCH 06/75] haskellPackages.hackage-db: 2.1.2 -> 2.1.3 This update adds support for $CABAL_DIR as well as the new $XDG_CACHE_HOME location of the hackage db. Since we maintain hackage-db, having the latest version always is nice even though it has more reverse dependencies than the other libraries we maintain. --- .../scripts/haskell/update-stackage.sh | 1 + .../configuration-hackage2nix/stackage.yaml | 1 - .../haskell-modules/hackage-packages.nix | 22 ------------------- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 4acb76233c62..4fee4330843f 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -58,6 +58,7 @@ sed -r \ -e '/ distribution-nixpkgs /d' \ -e '/ jailbreak-cabal /d' \ -e '/ language-nix /d' \ + -e '/ hackage-db /d' \ -e '/ cabal-install /d' \ -e '/ lsp /d' \ -e '/ lsp-types /d' \ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index c50c8ca2d455..ac43489e38ec 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1002,7 +1002,6 @@ default-package-overrides: - gtk-strut ==0.1.3.2 - guarded-allocation ==0.0.1 - hackage-cli ==0.0.3.6 - - hackage-db ==2.1.2 - hackage-security ==0.6.2.3 - haddock-library ==1.10.0 - hakyll ==4.15.1.1 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 71649d34bd54..5c0d20bff3e6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -125571,27 +125571,6 @@ self: { }) {}; "hackage-db" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, exceptions, filepath, tar, time, utf8-string - }: - mkDerivation { - pname = "hackage-db"; - version = "2.1.2"; - sha256 = "1aj82n2ay16zman829gq7s9dkg3qyyavca8hhjfibx8hzg6pmnap"; - revision = "1"; - editedCabalFile = "12k9vm584l6glfkj92j1b2498g2sijdb8ypjmbb01yfn2xgbhkiv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filepath tar time utf8-string - ]; - description = "Access cabal-install's Hackage database via Data.Map"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.sternenseemann ]; - }) {}; - - "hackage-db_2_1_3" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string }: @@ -125607,7 +125586,6 @@ self: { ]; description = "Access cabal-install's Hackage database via Data.Map"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.sternenseemann ]; }) {}; From 2c97ab29dff951e3af6d7617a64946e6676062d7 Mon Sep 17 00:00:00 2001 From: Teo Camarasu Date: Thu, 13 Apr 2023 21:11:07 +0100 Subject: [PATCH 07/75] haskellPackages.eventlog2html: fix build --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index ce375bfe0839..748c38df6f41 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1404,7 +1404,6 @@ broken-packages: - eved - event - event-driven - - eventlog2html # failure in job https://hydra.nixos.org/build/214597490 at 2023-04-07 - eventsource-api - eventsourced - eventstore diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8dde53af696b..10306f9a04bd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -46,6 +46,8 @@ default-package-overrides: - pandoc-crossref < 0.3.15.0 # Needs to match hspec which is tracked in stackage - hspec-api < 2.10 + # 2023-04-13: latest version requires ghc-events >= 0.19 but it's not on LTS yet + - eventlog2html < 0.10 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. From 8ddb133890df988b5fb5367e5c48565217199c6a Mon Sep 17 00:00:00 2001 From: Teo Camarasu Date: Thu, 13 Apr 2023 21:23:18 +0100 Subject: [PATCH 08/75] 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 | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5c0d20bff3e6..da97749dbbb8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -95000,6 +95000,31 @@ self: { }) {}; "eventlog2html" = callPackage + ({ mkDerivation, aeson, array, attoparsec, base, blaze-html + , bytestring, containers, file-embed, filepath, ghc-events + , ghc-heap, githash, hashable, hashtables, hvega, mtl + , optparse-applicative, semigroups, statistics-linreg, text, time + , trie-simple, vector + }: + mkDerivation { + pname = "eventlog2html"; + version = "0.9.3"; + sha256 = "1wgpqrqkk0cvyxmmgkmq04k3d1v91qdqb737xx7k51d3lb909n7l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array attoparsec base blaze-html bytestring containers + file-embed filepath ghc-events ghc-heap hashable hashtables hvega + mtl optparse-applicative semigroups statistics-linreg text time + trie-simple vector + ]; + executableHaskellDepends = [ aeson base filepath githash text ]; + description = "Visualise an eventlog"; + license = lib.licenses.bsd3; + mainProgram = "eventlog2html"; + }) {}; + + "eventlog2html_0_10_0" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, blaze-html , blaze-markup, bytestring, containers, file-embed, filepath , ghc-events, ghc-heap, githash, hashable, hashtables, hvega, mtl @@ -95023,7 +95048,6 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "eventlog2html"; - broken = true; }) {}; "eventloop" = callPackage From 1220b75c47110cff68f836be16045b8a78be646f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Apr 2023 05:14:38 +0000 Subject: [PATCH 09/75] bitwig-studio: 4.4.8 -> 4.4.10 --- pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index e6b0bea5d4e6..9d4da6407461 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.4.8"; + version = "4.4.10"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-qdqRvCmp6Q7lcTdOIEHeQKAAOLtJxs867gapopyeHuc="; + sha256 = "sha256-gtQ1mhXk0AqGidZk5TCzSR58pD1JJoELMBmELtqyb4U="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; From b79286ea28bd91de5d7b734fc26eddb6560324df Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 13 Apr 2023 12:28:34 +0200 Subject: [PATCH 10/75] maintainers/haskell/upload-package-list: support 3.10 config dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cabal-install 3.10 has some quirky new logic for config, cache, … directory discovery. We reimplement this in this simple bash script, additionally respecting the CABAL_DIR environment variable. --- .../upload-nixos-package-list-to-hackage.sh | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 8c39d289f7aa..86fecbc3d87c 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -15,8 +15,29 @@ # password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.) # Those fields are specified under `upload` on the `cabal` man page. +if test -z "$CABAL_DIR"; then + dirs=( + "$HOME/.cabal" + "${XDG_CONFIG_HOME:-$HOME/.config}/cabal" + ) + missing=true + + for dir in "${dirs[@]}"; do + if test -d "$dir"; then + export CABAL_DIR="$dir" + missing=false + break + fi + done + + if $missing; then + echo "Could not find the cabal configuration directory in any of: ${dirs[@]}" >&2 + exit 101 + fi +fi + package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" -username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //") -password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //") +username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //") +password_command=$(grep "^password-command:" "$CABAL_DIR/config" | sed "s/^password-command: //") curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv echo From 2400c6bdb20f5b09e698c797ee07cfc090c744f9 Mon Sep 17 00:00:00 2001 From: Silas Davis Date: Sat, 15 Apr 2023 11:29:50 +0200 Subject: [PATCH 11/75] Bump pop-shell Signed-off-by: Silas Davis --- pkgs/desktops/gnome/extensions/pop-shell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix index 839a4d9949f2..fbe88e96b873 100644 --- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-pop-shell"; - version = "unstable-2022-10-11"; + version = "unstable-2023-04-05"; src = fetchFromGitHub { owner = "pop-os"; repo = "shell"; - rev = "886a069c0582b371e90ac3602b1747ea5fba616c"; - hash = "sha256-DwJ3IFhYuEW0LQrmN/mOspEiudj4X5BCLhdOyP74EVs="; + rev = "a3a1b7bb832838fec2ea875954d33443fc680912"; + hash = "sha256-B82UKtJRDDejBX1UBBIjPRO8rzHNapJRi8wv6dT7oJ8="; }; nativeBuildInputs = [ glib nodePackages.typescript gjs ]; From 73664db7fa39cd811e87d0e0703464f097ae639d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 16 Apr 2023 08:21:19 +0000 Subject: [PATCH 12/75] janus-gateway: 1.1.2 -> 1.1.3 --- pkgs/servers/janus-gateway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index fa0296c55ebb..bc09a5ab7ec2 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-32xl/dVMuT9olC0fuN9dZFz1c6N9sLA5V9qaSjqkfo4="; + sha256 = "sha256-2UlIpxixTl16VG6lgcfk+9LXSWn0jV1IfIkCeV/SO5w="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; From 2dd10bd4eba637bdeed723c1648e99a6a38d63ce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 16 Apr 2023 08:22:00 +0000 Subject: [PATCH 13/75] janus-gateway: add changelog to meta --- pkgs/servers/janus-gateway/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/janus-gateway/default.nix b/pkgs/servers/janus-gateway/default.nix index bc09a5ab7ec2..0eac828f8d20 100644 --- a/pkgs/servers/janus-gateway/default.nix +++ b/pkgs/servers/janus-gateway/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "General purpose WebRTC server"; homepage = "https://janus.conf.meetecho.com/"; + changelog = "https://github.com/meetecho/janus-gateway/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; From 349cdce31e42b0388e139758e9542037c9ae7d6e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 16 Apr 2023 16:27:59 +0200 Subject: [PATCH 14/75] haskellPackages.jsaddle-webkit2gtk: Apply patch for webkit 2.40 compat --- .../haskell-modules/configuration-common.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ef49ab976244..180fd5f4f40a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1423,12 +1423,21 @@ self: super: { }); }; - jsaddle-webkit2gtk = overrideCabal (old: { - postPatch = old.postPatch or "" + '' - sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal - ''; - }) super.jsaddle-webkit2gtk; + # 2023-04-16: https://github.com/ghcjs/jsaddle/pull/137 + jsaddle-webkit2gtk = lib.pipe super.jsaddle-webkit2gtk + [ + (appendPatch (fetchpatch { + url = "https://github.com/ghcjs/jsaddle/commit/f990366f19d23a8008d482572d52351c1a6f7215.patch"; + hash = "sha256-IbkJrlyG6q5rqMIhn//Dt3u6T314Pug+mQMwwe0LK5w="; + relative = "jsaddle-webkit2gtk"; + })) + (overrideCabal (old: { + postPatch = old.postPatch or "" + '' + sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal + ''; + })) + ]; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { From f7eee9453835e5effc4fb02a31a2b89b677198e3 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 16 Apr 2023 16:53:42 +0200 Subject: [PATCH 15/75] haskellPackages: Remove trailing whitespace --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 180fd5f4f40a..1c220525ef7c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1437,7 +1437,7 @@ self: super: { sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal ''; })) - ]; + ]; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: { From af0ce076612bd4b2c3ff4fa3279dafdaa5c5b44a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 16/75] lxqt.liblxqt: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 4528abd0cec7..c7a34a9c493c 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "liblxqt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "x1gzqmTHDnpAdLxacKyl+gDob1M7toTDUufaM0y+AHA="; + sha256 = "Ug6LmDxynSDLWykZhnih2F9lT34aOlU0ewM88PX+5Ms="; }; nativeBuildInputs = [ From 97271f5991e0c785044d8ec9405607cc73300380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 17/75] lxqt.libqtxdg: 3.10.0 -> 3.11.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 066d2ec1ecdd..4f155f39576a 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "Lynm6Qxy02Os69YQ1cb2W0hV7sq9kBhbACqjHTGj7Tw="; + sha256 = "b3XR0Tn/roiCjNGb3EMf4ilECNaUjGYi11ykVBppBuc="; }; nativeBuildInputs = [ From 2e4a8e6376f0ad45ec226da2294b17a73c379035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 18/75] lxqt.libfm-qt: 1.2.1 -> 1.3.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 20ededd3dc26..a19a8a208330 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; rev = version; - sha256 = "CrCLwAdkSIhEKJtVJdtHvwEUNKhcvF22p3OOWOuxBAk="; + sha256 = "MK1QMYfr0T/cE46IUWarG9a/PJUSSskk1W3y2+kvEwg="; }; nativeBuildInputs = [ From bf17d531b91f728b9720e9e4e0c9d2a5e3536e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 19/75] lxqt.lximage-qt: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index f0cdb88c95f4..f33e6986d8c7 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lximage-qt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "T/LvxnHi0094wvxjB+6W7Ztg2lxkSu5yzjGx/jSzM8Y="; + sha256 = "afCW3VeXAq2HYc4fjSrd+7j6cGoHmGlO8jCiNq6/F3E="; }; nativeBuildInputs = [ From 96412f3bb89f442d8667762297ca15f2446a3d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 20/75] lxqt.lxqt-about: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index cc021c4fc5ea..993721b443e5 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-about"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "aOGbT8DwDAfp8odcOkNsZkuI/guSRbQnETii5o24jcU="; + sha256 = "Dm4WFtF0O7MgAvwYBI/1DkY9MhneI+QSM+wRp4JlD+o="; }; nativeBuildInputs = [ From 6182cbb4b3be85e8d8a74aacf6b415ffd7aa38f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 21/75] lxqt.lxqt-admin: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 75aa6a6a2571..540c04b85c59 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0b6I45O4hUSnhP+IJJV8jesJgWpg3Y53TEaROhGQctY="; + sha256 = "glSxrSCr56lpdWca9q8hgnMcW22DNdsIyBzxPmQXQOY="; }; nativeBuildInputs = [ From 49df77a302dc9aab38d78d60a3d769365fce6c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 22/75] lxqt.lxqt-archiver: 0.7.0 -> 0.8.0 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index f3099b83592c..b8e31a378c25 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; rev = version; - sha256 = "aHN17sugIoH5UfbOn11mDofq2EY7KByYCWE5NJRJWbo="; + sha256 = "C38c/jCyRur7jQSgU2ByasCQnollHgy3/mUoNv61OCU="; }; nativeBuildInputs = [ From 670a6325291962dd852679273f60501fe81490a0 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 16 Apr 2023 14:38:02 +0200 Subject: [PATCH 23/75] powertop: change substitute for xset --- pkgs/os-specific/linux/powertop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 02c2851177a7..481cf1cd3bb5 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -12,6 +12,7 @@ , nix-update-script , testers , powertop +, xorg }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" - substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" + substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "${lib.getExe xorg.xset}" substituteInPlace src/tuning/bluetooth.cpp --replace "/usr/bin/hcitool" "hcitool" ''; From 45c1aabe9472a2570b07496bdc82868ec958785c Mon Sep 17 00:00:00 2001 From: "Emil \"AngryAnt\" Johansen" Date: Mon, 17 Apr 2023 15:05:21 +0200 Subject: [PATCH 24/75] yed: 3.22 -> 3.23.1 3.22 src 404s again --- pkgs/applications/graphics/yed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index b1d96f2d1f42..7810ea3213d8 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.22"; + version = "3.23.1"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "sha256-GHYdvWie2k9YarS9DaA4bExswV3UQ26O8+7K/6yvtac="; + sha256 = "sha256-MboljULek5vCcHpRFL9kdT4AROTD774AOBYeOTzcdig="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; From 56315519c95b5f598f933127d1e087be08bb48d1 Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Mon, 17 Apr 2023 20:29:01 +0800 Subject: [PATCH 25/75] maintainers: add onedragon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9ea2f578de3a..a14bf347e6bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11506,6 +11506,12 @@ githubId = 1538622; name = "Michael Reilly"; }; + onedragon = { + name = "YiLong Liu"; + email = "18922251299@163.com"; + github = "jackyliu16"; + githubId = 50787361; + }; onixie = { email = "onixie@gmail.com"; github = "onixie"; From 79d5a53953b33598f9b29fef6ca296f5f8597b09 Mon Sep 17 00:00:00 2001 From: jackyliu16 <18922251299@163.com> Date: Mon, 17 Apr 2023 20:33:28 +0800 Subject: [PATCH 26/75] realvnc-vnc-viewer: 6.22.515 -> 7.1.0 1. update x86_64-linux rpm packages 2. remove Unsupported i686-linux rpm packages 3. add buildInputs stdenv.cc.cc.libgcc ref: https://github.com/NixOS/nixpkgs/issues/225963 --- .../admin/realvnc-vnc-viewer/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index f7a8f7ca92f4..e6f60459bfbd 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, rpmextract, libX11, libXext }: +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, rpmextract +, libX11 +, libXext +}: stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.22.515"; + version = "7.1.0"; src = { "x86_64-linux" = fetchurl { - url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "1l9kfmb1695pv2v9hm8z5yr7y5yhadbbs61s4yf9ksvvfypzwrpn"; - }; - "i686-linux" = fetchurl { - url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "15fi1siwbsxmy7qi6f8r8ym346a8mx3kqcp9mvwvx39wm3ija6dh"; + url = "https://downloads.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; + sha256 = "sha256-Mn4K2HICK7owHcXH85IJUncnpPZ56zNybkHZNiqYkHY="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); nativeBuildInputs = [ autoPatchelfHook rpmextract ]; - buildInputs = [ libX11 libXext ]; + buildInputs = [ libX11 libXext stdenv.cc.cc.libgcc or null ]; unpackPhase = '' rpmextract $src @@ -47,7 +50,7 @@ stdenv.mkDerivation rec { url = "https://static.realvnc.com/media/documents/LICENSE-4.0a_en.pdf"; free = false; }; - maintainers = with maintainers; [ emilytrau ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ emilytrau onedragon ]; + platforms = [ "x86_64-linux" ]; }; } From de9b7f2e5d236907afeff351c9e4e3d9b916bf76 Mon Sep 17 00:00:00 2001 From: Niols Date: Mon, 17 Apr 2023 16:36:55 +0100 Subject: [PATCH 27/75] ocamlPackages.dates_calc: init at 0.0.4 --- .../ocaml-modules/dates_calc/default.nix | 33 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dates_calc/default.nix diff --git a/pkgs/development/ocaml-modules/dates_calc/default.nix b/pkgs/development/ocaml-modules/dates_calc/default.nix new file mode 100644 index 000000000000..4a2b9f176822 --- /dev/null +++ b/pkgs/development/ocaml-modules/dates_calc/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub, buildDunePackage +, alcotest, qcheck +}: + +buildDunePackage rec { + pname = "dates_calc"; + version = "0.0.4"; + + minimalOCamlVersion = "4.11"; + duneVersion = "3"; + + src = fetchFromGitHub { + owner = "catalalang"; + repo = "dates-calc"; + rev = version; + sha256 = "sha256-tpKOoPVXkg/k+NW5R8A4fGAKhdMn9UcqMogCjafJuw4="; + }; + + propagatedBuildInputs = []; + + doCheck = true; + checkInputs = [ + alcotest + qcheck + ]; + + meta = { + description = "A date calculation library"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.niols ]; + homepage = "https://github.com/catalalang/dates-calc"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ebf6ba6dc056..52d61382cefe 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -289,6 +289,8 @@ let data-encoding = callPackage ../development/ocaml-modules/data-encoding { }; + dates_calc = callPackage ../development/ocaml-modules/dates_calc { }; + dbf = callPackage ../development/ocaml-modules/dbf { }; decompress = callPackage ../development/ocaml-modules/decompress { }; From dfbcd782b3ad78ab1fd38b6a6194834014080834 Mon Sep 17 00:00:00 2001 From: Niols Date: Mon, 17 Apr 2023 16:44:54 +0100 Subject: [PATCH 28/75] ocamlPackages.ppx_monad: init at 0.2.0 --- .../ocaml-modules/ppx_monad/default.nix | 32 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ppx_monad/default.nix diff --git a/pkgs/development/ocaml-modules/ppx_monad/default.nix b/pkgs/development/ocaml-modules/ppx_monad/default.nix new file mode 100644 index 000000000000..6c71dcb26c5f --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_monad/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildDunePackage +, ppxlib +}: + +buildDunePackage rec { + pname = "ppx_monad"; + version = "0.2.0"; + + duneVersion = "3"; + + src = fetchFromGitHub { + owner = "niols"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cbguAddSlUxBK7pmT7vNmtJW9TrVZZjdSJRMT3lqxOA="; + }; + + propagatedBuildInputs = [ + ppxlib + ]; + + doCheck = true; + checkInputs = [ + ]; + + meta = { + description = "An OCaml Syntax Extension for all Monadic Syntaxes"; + license = lib.licenses.lgpl3Plus; + maintainers = [ lib.maintainers.niols ]; + homepage = "https://github.com/niols/${pname}"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index ebf6ba6dc056..974a0d9711b8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1345,6 +1345,8 @@ let ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; + ppx_monad = callPackage ../development/ocaml-modules/ppx_monad { }; + ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { }; ppx_tools = From bda7e117c52d628d91e604482633a193993c41e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 29/75] lxqt.lxqt-build-tools: 0.12.0 -> 0.13.0 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 6797c24946b7..f31d1561bb52 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,7 +1,5 @@ { lib -, stdenv , mkDerivation -, fetchpatch , fetchFromGitHub , cmake , pkg-config @@ -14,13 +12,13 @@ mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "18+xSHBjYmtENGJuTf8yJh4C4QTNYttr8ucRU8KK1HU="; + sha256 = "4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA="; }; postPatch = '' From 9c86a46a8689f8d3ad807c1fa6292c5ed8b6c0ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 30/75] lxqt.lxqt-config: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 727ae6358599..2c8c5d9b4a67 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -21,26 +21,15 @@ mkDerivation rec { pname = "lxqt-config"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24="; + sha256 = "Gm/Y/5i7Abob9eRdLZHpRma2+Mdh2LBZUGKM4mMZMFk="; }; - patches = [ - # FIXME: backport Plasma 5.27 build fix, remove for next release - (fetchpatch { - url = "https://github.com/lxqt/lxqt-config/commit/6add4e4f0040693e7c4242fbae48c9d32007686c.diff"; - hash = "sha256-Tir4KeGhBnD9dYmB1FAjuf4R4V+rn12MOxsRwTdE0Sc="; - }) - ]; - - # FIXME: required to build with Plasma 5.27, which uses std::optional - cmakeFlags = ["-DCMAKE_CXX_STANDARD=17"]; - nativeBuildInputs = [ cmake pkg-config From 83762543e5eb0f944ec6525c438fcc1645e9e968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:28 -0300 Subject: [PATCH 31/75] lxqt.lxqt-globalkeys: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 18b50333752d..6bdcc59bc353 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "GZ5E8OAx7Wb1bEwqwmYdOVcOXFaTxD1SibADgTWhdbg="; + sha256 = "lo5FG6+kQTm15MEh+CZO2DvywsLrmX4sKzs4Rka6GSo="; }; nativeBuildInputs = [ From ef0c5333abc3ee148c9ca111f692d4f67b636749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 32/75] lxqt.lxqt-notificationd: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index e567da7f2a50..47792b35388d 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "RbOkMsz3jejoij/GnRbGuoA7vW4GTZxPnkIfbhq64qI="; + sha256 = "zfoTc+O8eYpUc13vzHUuk71q+MATNGEGtiYhQmFldtw="; }; nativeBuildInputs = [ From 47e182132aa25d5373bb92f1dbb510cdd18d1810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 33/75] lxqt.lxqt-openssh-askpass: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 1c6dc6ab492f..a14cbd7da243 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1uBgP4cOKypZZbMVYdvgM7GyZI2Ef3XmuAfs0nPzHd0="; + sha256 = "6S+x8Az9e7rZ8i5p6+F3PZjx7k8fJcM1b/55dJdkuOM="; }; nativeBuildInputs = [ From 7ad834fb3e2476c3e58c65f2e8d29439092b2061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 34/75] lxqt.lxqt-panel: 1.2.1 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index d1b10f4f91f6..fb901742ea65 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "TwVM0JY+BMvw6e/mzy82AH5E6pPsffE6oadd0BuCZk0="; + sha256 = "tSj7GGIvneYapkyqqgSMJtPGApC1fdpiId2XgQF5xf0="; }; nativeBuildInputs = [ From b353525e5e2c1ac787bba2937f4e2f9742d17697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 35/75] lxqt.lxqt-policykit: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 6c50ae6fbc5b..0478c108e219 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "SvJ4XN0JZs2VAt5H9CJXrJhThxnQnlbsLP44CW7zpGM="; + sha256 = "ZcftMdMBj/7OhxRZ34AB0IW5CfDYTT8JZLJejTb0XVg="; }; nativeBuildInputs = [ From b2be78e4de23c35ad87f48e0b9468805566cf4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 36/75] lxqt.lxqt-powermanagement: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 38a78203c354..32834a4a49a4 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-powermanagement"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "yUQYvAWAsbaa2acwzIqnlFt5bsFLT63/RQdvWUsopqc="; + sha256 = "lnEi3Emwx3ykIx1ZlRMjRP3FAaYgIhsVpY9r0dT3DEE="; }; nativeBuildInputs = [ From b17234baba6bc3f740b53623f2f621b1d96ac827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 37/75] lxqt.lxqt-qtplugin: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index ade0157742bd..4b27307520cd 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "oxETofSxje7fNEI8AahSUCaT+k/flfU6XJroMhtdiCw="; + sha256 = "/phBrpSru/4m+mcAkn4C6hKm5H2BAXNkbTgU2HmoyBg="; }; nativeBuildInputs = [ From 90512d552e4f09addb0a74069c7eea0b74493a55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 38/75] lxqt.lxqt-runner: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 8a27606ec977..7300331ab98e 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "fJHTw7xPn7rWVd+H1cDnNmeu3BPlE/ta0VOfJsUfSNs="; + sha256 = "iC0XTdgB1+hwMfc/45JiEfAhwadbFOgTTJj9Kvxx+l4="; }; nativeBuildInputs = [ From db0c6cf3b5d6974170950bcbd807c8ffcf13ff04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 39/75] lxqt.lxqt-session: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 2241d3e8f361..6de643d72737 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-session"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "EmaMIoVouC1/B/WrLwynynx3F9A1Ae5kT3uhl5HVQg8="; + sha256 = "jhz1OHnPvjZMSo8+X/pf8rVLjPPSEiE7BDLnhUp/Vbk="; }; nativeBuildInputs = [ From 0a0781d4e17909d6868ef70f8d3be71aeefb94b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 40/75] lxqt.lxqt-sudo: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 9d3cc4aeacb9..6d5fd9da8546 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "oa6q85iPOrhou1ii7/CsdIWnf5VNkxs55QMtiQWRM2c="; + sha256 = "S+NWoF1l0HPOwceWwhfmGo7Xrm+6GeoMpJbGpK16rZs="; }; nativeBuildInputs = [ From 620425edad0608f422bfc66b90a5d174b0a62f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:29 -0300 Subject: [PATCH 41/75] lxqt.lxqt-themes: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 442bf0268278..1cbc1949b20d 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "lxqt-themes"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "c7SGsnF2t2IrQFZODVmZS0ijJ7G1KiLWOLm7Rs2hehs="; + sha256 = "bmkvg62lNFRhSerKFSo2POP8MWa1ZrdSi2E9nWDQSRQ="; }; nativeBuildInputs = [ From 26bf7bbe84d0a3418d15d5a27d22400db4b27aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 42/75] lxqt.pavucontrol-qt: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index e39bf81c56c9..3bff6b7f1eb3 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "pavucontrol-qt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "OCMdfwbvgjb+7IYDp/NKF/gI4luJGFfFRKZH64JsPP8="; + sha256 = "cXYJ9EMmZ1LHBvjRWM1TEv7ADdG69DTyb5DZN7q3NIQ="; }; nativeBuildInputs = [ From b2b767fcffd44ec8da2f2a0041de447c5f5edc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 43/75] lxqt.pcmanfm-qt: 1.2.1 -> 1.3.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index ed3eed1b422c..b26c30b14e0c 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "HzA6+dOxXyeKrzYaR5Xwqj91rivc66ObjTLKHUay61A="; + sha256 = "qqvjsZRG+ImKHr+XLNNHhnAe1kBWh47/nFcKB1MTSJo="; }; nativeBuildInputs = [ @@ -39,7 +39,6 @@ mkDerivation rec { qtx11extras qtimageformats # add-on module to support more image file formats libfm-qt - libfm-qt menu-cache lxmenu-data ]; From 9fbb59ef0fa0a98c0bbe068c2884eb4a6e37c8ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 44/75] lxqt.qps: 2.6.0 -> 2.7.0 --- pkgs/desktops/lxqt/qps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 544a4dbadf0a..4873c1055cbe 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "qps"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "A0JIZNNv/6lUlKnEp8MbBe+3lIQzyjqSPjlYcwbpENk="; + sha256 = "70mANEnui/orN+8eIBzCCSsh5wvPXuPUAAwRcXtHsaY="; }; nativeBuildInputs = [ From 8e787d0460684d8bfce42cfbf7b2da0b3471e73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 45/75] lxqt.qterminal: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 21ec713868fc..e49b717cb231 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "qterminal"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "7fsMJdObNjXSXfmS2TxXtbErnRCZCJZb7WitE6y1xjg="; + sha256 = "/R/fv8UAOeCVvXXBAXjturTTmN/LeqLKFJjAmEry2WU="; }; nativeBuildInputs = [ From b38a3f2037bd07af9efb05260cbca468ab41f265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 46/75] lxqt.qtermwidget: 1.2.0 -> 1.3.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 9eea77ca16b9..719183095a96 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "qtermwidget"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "utQC0CNZtwHD0yAaV9Tr0iEUBa8DcrEMNKmWyuhj6GQ="; + sha256 = "eir9PvJXzAQYwRqoUf0Nc4SfkVGa7bohbJVdKPCoyNs="; }; nativeBuildInputs = [ From a4295d62cfb678a1eb1010d188a57d3b7bdf9720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 47/75] lxqt.qtxdg-tools: 3.10.0 -> 3.11.0 --- pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix index 10ca3ce7dc96..aa8ea1acd979 100644 --- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix +++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtxdg-tools"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "sha256-8jrb1Mdn9dhQzIEu6E0kz5F8eEnKAREwjXuypqfhw60="; + sha256 = "sha256-iUvjLZbTDBsQw7PIA0LUAvhoq6FrdbLhjbMwKdE01Hc="; }; nativeBuildInputs = [ From 73c9e3a66e9be4ddcda974cecf1c524bc109cfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 48/75] lxqt.screengrab: 2.5.0 -> 2.6.0 --- pkgs/desktops/lxqt/screengrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 00b793a15f6b..f4f94e237865 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "screengrab"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "QEe1vOAeUDOlQfTh5/BvwBv9+v40NsuoMbC77+U6GCA="; + sha256 = "ySC5bCOnen2bjhmLY4GnwiFaUrvGx93LJrLQo0pBUc4="; }; nativeBuildInputs = [ From 6da3d3a400a0e0bbccc4dcc20862e0211cd3a6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 16 Apr 2023 13:53:30 -0300 Subject: [PATCH 49/75] lxqt.xdg-desktop-portal-lxqt: 0.3.0 -> 0.4.0 --- pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix index 8d317dadd8cb..0735a2212c7e 100644 --- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix +++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "xdg-desktop-portal-lxqt"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "oEcFRBIYb/ZJQo9W+yIiq3l3eU1GqUzfDdF/Rvq5SKs="; + sha256 = "gH4L6cjx3DjGWcgoqUSnsx4Bn+T9t03AXPB5ZNDa0Nw="; }; nativeBuildInputs = [ From 9941f1457d010a2e3c4cfd88fd298b8374bf1953 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Apr 2023 22:22:49 +0200 Subject: [PATCH 50/75] python310Packages.env-canada: 0.5.32 -> 0.5.33 Diff: https://github.com/michaeldavie/env_canada/compare/refs/tags/v0.5.32...v0.5.33 Changelog: https://github.com/michaeldavie/env_canada/blob/v0.5.33/CHANGELOG.md --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index a01b7cbc8a6b..a00ae197ca0a 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.32"; + version = "0.5.33"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-YX0v1i8PuVDq1+LPxV2Fs76N4PLxAQrKCAIeabmzNwc="; + hash = "sha256-td4baHAtBuNqUpe11HBtsMl6fW9n5w12U+KUUc1SmIQ="; }; propagatedBuildInputs = [ From a5c08404835b908ad98b6a20756b614f5910ce1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Apr 2023 22:33:37 +0200 Subject: [PATCH 51/75] python310Packages.reolink-aio: 0.5.12 -> 0.5.13 Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.5.12...0.5.13 Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.5.13 --- pkgs/development/python-modules/reolink-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 28a19d85602b..424ec8aaed51 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.5.12"; + version = "0.5.13"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-HMuMoJFiI/zmFGuhoj9jtE073MvIZRA8bvUNIYlBvOY="; + hash = "sha256-jIdKNOYj+ahqfMqTPYwf5fCwHVRn+CLecqlQCXslVG4="; }; postPatch = '' From 0f2e3635c5c8d82fda0319f23ed6b3b3d939f874 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 17 Apr 2023 22:54:50 +0200 Subject: [PATCH 52/75] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1793665](https://hydra.nixos.org/eval/1793665) of nixpkgs commit [f7eee94](https://github.com/NixOS/nixpkgs/commits/f7eee9453835e5effc4fb02a31a2b89b677198e3) as of 2023-04-17 20:51 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 4 ++++ .../configuration-hackage2nix/transitive-broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 9 +++++++++ 3 files changed, 14 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 748c38df6f41..965cfc201983 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -473,6 +473,7 @@ broken-packages: - brick-dropdownmenu - brick-filetree - brick-list-search # failure in job https://hydra.nixos.org/build/211236614 at 2023-03-13 + - brick-list-skip # failure in job https://hydra.nixos.org/build/215850872 at 2023-04-17 - bricks-internal - brick-tabular-list - brillig @@ -3464,6 +3465,7 @@ broken-packages: - monoidplus - monoids - monoid-statistics + - monomer-flatpak-example # failure in job https://hydra.nixos.org/build/215851035 at 2023-04-17 - monopati - monus - monzo @@ -3741,6 +3743,7 @@ broken-packages: - opaleye-trans - open-adt - OpenAFP + - openai-hs # failure building library in job https://hydra.nixos.org/build/215850908 at 2023-04-17 - openapi3 - openapi3-code-generator - openapi-petstore @@ -3984,6 +3987,7 @@ broken-packages: - pg-store - pgstream - pg-transact + - pgvector # failure in job https://hydra.nixos.org/build/215851675 at 2023-04-17 - phasechange - phaser - phoityne diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5c9de5b9956f..542ca1670d61 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -933,6 +933,7 @@ dont-distribute-packages: - categorical-algebra - category - category-extras + - cattrap - cctools-workqueue - cef3-simple - ceilometer-common diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index da97749dbbb8..7d7cf1f9da98 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -49507,6 +49507,8 @@ self: { libraryHaskellDepends = [ base brick containers microlens vector ]; description = "Skip a certain kind of items when moving in brick list"; license = lib.licenses.bsd0; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "brick-panes" = callPackage @@ -56870,6 +56872,7 @@ self: { ]; description = "Lays out boxes according to the CSS Box Model"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "cattrap"; }) {}; @@ -198508,7 +198511,9 @@ self: { ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "monomer-flatpak-example"; + broken = true; }) {}; "monomer-hagrid" = callPackage @@ -212673,6 +212678,8 @@ self: { ]; description = "Unofficial OpenAI client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "openai-servant" = callPackage @@ -223271,6 +223278,8 @@ self: { testHaskellDepends = [ base postgresql-simple ]; description = "pgvector support for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "phantom-state" = callPackage From 50bf9252cc6d70f7532cc3a7be75311e2d913772 Mon Sep 17 00:00:00 2001 From: Noel Gisler Date: Mon, 17 Apr 2023 22:15:00 +0200 Subject: [PATCH 53/75] gnomeExtensions.dash-to-dock v79 -> v80 --- pkgs/desktops/gnome/extensions/dash-to-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix index 500cf3fa7749..51681584672c 100644 --- a/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-dash-to-dock"; - version = "79"; + version = "80"; # Temporarily switched to commit hash because stable version is buggy. src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; rev = "extensions.gnome.org-v${version}"; - sha256 = "sha256-vqQ9nAa/avae2+0xJ5gApbAU07pawi+R6IEQ9O6DTjs="; + sha256 = "sha256-b9XdLd4tcgp+B8HDlJZXjpJI3x5KE/YwckKd9+VA2Sk="; }; nativeBuildInputs = [ From 7f0e744480f2aec5ea22faebcf6ad142fc1bead1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 17 Apr 2023 23:09:47 +0200 Subject: [PATCH 54/75] python310Packages.pylacrosse: patch version --- .../python-modules/pylacrosse/default.nix | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index a3349ff2ec96..f247f42e975b 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -5,20 +5,31 @@ , nose , pyserial , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pylacrosse"; version = "0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-lacrosse"; - rev = version; - sha256 = "0g5hqm8lq0gsnvhcydjk54rjf7lpxzph8k7w1nnvnqfbhf31xfcf"; + rev = "refs/tags/${version}"; + hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw="; }; - propagatedBuildInputs = [ pyserial ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "version = version," "version = '${version}'," + ''; + + propagatedBuildInputs = [ + pyserial + ]; nativeCheckInputs = [ mock @@ -26,7 +37,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "pylacrosse" ]; + pythonImportsCheck = [ + "pylacrosse" + ]; meta = with lib; { description = "Python library for Jeelink LaCrosse"; From 2c544dbb850d2c2843c6d80f6b072d773d79e212 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 17 Apr 2023 23:45:03 +0200 Subject: [PATCH 55/75] haskellPackages.ghc-debug-brick: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1c220525ef7c..334b41bdee1e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -247,6 +247,9 @@ self: super: { ghcjs-base = null; ghcjs-prim = null; + # 2023-04-17: https://gitlab.haskell.org/ghc/ghc-debug/-/issues/20 + ghc-debug-brick = doJailbreak super.ghc-debug-brick; + # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 965cfc201983..8170c9d1555d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1744,7 +1744,6 @@ broken-packages: - ghc-clippy-plugin - ghc-core-smallstep - ghc-datasize - - ghc-debug-client - ghc-dump-tree - ghc-dup - ghc-events-analyze diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7d7cf1f9da98..1c14e64d866c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -95025,6 +95025,7 @@ self: { description = "Visualise an eventlog"; license = lib.licenses.bsd3; mainProgram = "eventlog2html"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "eventlog2html_0_10_0" = callPackage @@ -95051,6 +95052,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "eventlog2html"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "eventloop" = callPackage @@ -111507,6 +111509,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "ghc-debug-brick"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "ghc-debug-client" = callPackage @@ -111575,6 +111578,7 @@ self: { ]; description = "Functions for instrumenting your application so the heap can be analysed with ghc-debug-common"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "ghc-definitions-th" = callPackage From 34dbbdd6ebd9d029166dd5a31a7412132f134633 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 17 Apr 2023 23:46:31 +0200 Subject: [PATCH 56/75] haskellPackages: Add myself as maintainer for some packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 10306f9a04bd..da366910a8d7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -271,7 +271,10 @@ package-maintainers: - clay - ema - emanote + - eventlog2html - generic-optics + - ghc-debug-brick + - ghc-debug-stub - ghcid - graphql-client - haskell-language-server diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 1c14e64d866c..704e1344e1ad 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111532,8 +111532,6 @@ self: { ]; description = "Useful functions for writing heap analysis tools which use ghc-debug"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ghc-debug-common" = callPackage From f03dba5d676b2dbd0ff46147c982b49884f389cf Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Mon, 17 Apr 2023 17:34:34 -0400 Subject: [PATCH 57/75] python3Packages.meraki: 1.30.0 -> 1.32.1 Change logs: https://developer.cisco.com/meraki/whats-new/#!2023/4-2023 https://github.com/meraki/dashboard-api-python/releases/tag/1.32.1 --- pkgs/development/python-modules/meraki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 4e748e013198..530cca4d6d5e 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.30.0"; + version = "1.32.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-s26xGwWSWB+qpOTUe8IYo53ywYOaaUWjDznFqpmRlak="; + hash = "sha256-3iZ9/d78nAnK2+Kv0+0tuvZcfSV6ZF6QRF3xYL3NqV4="; }; propagatedBuildInputs = [ From 715bc56b080974f2be2bd985a0b96c95cefb3c05 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 16 Apr 2023 17:40:56 -0700 Subject: [PATCH 58/75] abiword: fix cross This commit adds `perl` to `nativeBuildInputs` of abiword, to avoid the following build failure: ``` abiword-aarch64-unknown-linux-gnu> checking for perl... no abiword-aarch64-unknown-linux-gnu> configure: error: *** perl program not found error: build of '/nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv' on 'ssh://root@192.168.22.102' failed: builder for '/nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv' failed with exit code 1 error: builder for '/nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv' failed with exit code 1; last 10 log lines: > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 PIC flag -fPIC -DPIC works... yes > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 static flag -static works... no > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 supports -c -o file.o... yes > checking if aarch64-unknown-linux-gnu-g++ -std=c++11 supports -c -o file.o... (cached) yes > checking whether the aarch64-unknown-linux-gnu-g++ -std=c++11 linker (aarch64-unknown-linux-gnu-ld) supports shared libraries... yes > checking dynamic linker characteristics... (cached) GNU/Linux ld.so > checking how to hardcode library paths into programs... immediate > checking whether ln -s works... yes > checking for perl... no > configure: error: *** perl program not found For full logs, run 'nix log /nix/store/v670j4pyqk5vy625gh7w0j2jla1wrz2s-abiword-aarch64-unknown-linux-gnu-3.0.5.drv'. ``` --- pkgs/applications/office/abiword/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 954c50befc8a..ab53692cf806 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook + perl ]; buildInputs = [ @@ -44,7 +45,6 @@ stdenv.mkDerivation rec { enchant wv libjpeg - perl boost libxslt goffice From 10d06c610fb80e724a53599b87a831f63b927866 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Mon, 17 Apr 2023 19:59:00 -0700 Subject: [PATCH 59/75] abiword: set strictDeps=true --- pkgs/applications/office/abiword/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index ab53692cf806..b90b23a3905a 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { goffice ]; + strictDeps = true; enableParallelBuilding = true; meta = with lib; { From 9d228c10ba1d25c37abfa82a497f34d188fd7359 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 03:25:24 +0000 Subject: [PATCH 60/75] fulcrum: 1.9.0 -> 1.9.1 --- pkgs/applications/blockchains/fulcrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 28571a57e1a0..4676eb5b7766 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-HAA5YRShLzxVP9aIP1RdDH09cZqjiZhZOxxc2EVGvx8="; + sha256 = "sha256-guvOs/HsSuj5QOMTzmKxMaC8iUyTkVgEpp8pQ63aIIQ="; }; nativeBuildInputs = [ pkg-config qmake ]; From e2584d57d6a54532b7027123756649997d6f78e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 05:06:28 +0000 Subject: [PATCH 61/75] exportarr: 1.2.6 -> 1.3.1 --- pkgs/servers/monitoring/prometheus/exportarr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index e7fed1b10e79..e8cd4a123427 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "exportarr"; - version = "1.2.6"; + version = "1.3.1"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - sha256 = "sha256-iiMfPqXUdmSAkzeRHZ3ZQHeQGtWxpiYCF0K7gZYly94="; + sha256 = "sha256-QZI3tYh2HXBDlZJWHQUAl/Yeyc/qCZGcfyFHbjCHlbU="; }; - vendorHash = "sha256-c09aWDxD11XEoR3sLlhteZXAK/Bd6DnJXmGEBofUl7s="; + vendorHash = "sha256-2Eb8FhbRu5M5u8HGa2bgAvZZkwHycBu8UiNKHG5/fFw="; subPackages = [ "cmd/exportarr" ]; From 49c494be20e172979d16245bb77bca41e4858dc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 05:59:48 +0000 Subject: [PATCH 62/75] ddosify: 0.15.4 -> 0.16.2 --- pkgs/development/tools/ddosify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 78bd50ad7d41..e439009e103a 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.15.4"; + version = "0.16.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-83/NZ/DcB7+jHFm1i3ru/vdUOhCP68xAkhrX4ekL8Uo="; + sha256 = "sha256-AieMl5/S+ywX29Xu510YqeFKV9IyDZYepO1r/kHklSo="; }; vendorHash = "sha256-/kxHK3dX1RXB3Z5suSKsTHF7xaklCoyzUTbU1lcYwwg="; From f20115d27df7e71183fd54f896ee08a4319414e1 Mon Sep 17 00:00:00 2001 From: Dacio Romero Date: Mon, 17 Apr 2023 22:44:33 -0700 Subject: [PATCH 63/75] gnomeExtensions.arcmenu: 43 -> 44 --- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 6 +++--- pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index b14e48d62dfe..8a0c7c29deb6 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "43"; + version = "44"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; - rev = "v${version}"; - sha256 = "sha256-Mb3C2H7jq+zVcLjb0iaiIdO6zmU54vhuYxhN6oBCyP8="; + rev = "v44.1"; + sha256 = "sha256-+aPBRxjL5lgdm96SbRZnp+9o9nl2N8Rb3dehMAv883c="; }; patches = [ diff --git a/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch index 5d8584f52a6a..3fd46e080649 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch +++ b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch @@ -1,11 +1,10 @@ --- a/extension.js +++ b/extension.js -@@ -23,6 +23,8 @@ - - const Me = imports.misc.extensionUtils.getCurrentExtension(); +@@ -20,6 +20,8 @@ + const ExtensionUtils = imports.misc.extensionUtils; + const Me = ExtensionUtils.getCurrentExtension(); +imports.gi.GIRepository.Repository.prepend_search_path('@gmenu_path@'); + - const {GLib, Gio, St} = imports.gi; const Constants = Me.imports.constants; const Controller = Me.imports.controller; From 50ce88d4ae0920ae4e0ac219774051c211a866a7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Apr 2023 08:11:11 +0200 Subject: [PATCH 64/75] =?UTF-8?q?ocamlPackages.mdx:=202.2.1=20=E2=86=92=20?= =?UTF-8?q?2.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/mdx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 02ef06044457..85a1a798b478 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "mdx"; - version = "2.2.1"; + version = "2.3.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - hash = "sha256-8J7XM/5EYWBfApdzdIpjU9Ablb5l65hrzOF9bdr1Cdg="; + hash = "sha256-MqCDmBAK/S0ueYi8O0XJtplxJx96twiFHe04Q8lHBmE="; }; nativeBuildInputs = [ cppo ]; From 5bbb301be2b91eee486949389abe254bc6643bbb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 18 Apr 2023 09:45:39 +0300 Subject: [PATCH 65/75] ocamlPackages.bdd: init at unstable-2022-07-14 --- .../development/ocaml-modules/bdd/default.nix | 30 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bdd/default.nix diff --git a/pkgs/development/ocaml-modules/bdd/default.nix b/pkgs/development/ocaml-modules/bdd/default.nix new file mode 100644 index 000000000000..1ddb8634f3cc --- /dev/null +++ b/pkgs/development/ocaml-modules/bdd/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildDunePackage +, fetchFromGitHub +, stdlib-shims +}: + +buildDunePackage { + pname = "bdd"; + version = "unstable-2022-07-14"; + + duneVersion = "3"; + + src = fetchFromGitHub { + owner = "backtracking"; + repo = "ocaml-bdd"; + rev = "6d1b1d3c24e5784b87e599a00230ce652acb2dcc"; + hash = "sha256-3mJZlAFQsI7AgrNQOe6N94CDfX5gXYqQBooV0jcoYEA="; + }; + + propagatedBuildInputs = [ + stdlib-shims + ]; + + meta = with lib; { + description = "Quick implementation of a Binary Decision Diagrams (BDD) library for OCaml"; + homepage = "https://github.com/backtracking/ocaml-bdd"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4bda5279c747..cf20f93b060f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -66,6 +66,8 @@ let batteries = callPackage ../development/ocaml-modules/batteries { }; + bdd = callPackage ../development/ocaml-modules/bdd { }; + benchmark = callPackage ../development/ocaml-modules/benchmark { }; bheap = callPackage ../development/ocaml-modules/bheap { }; From bc35d8dce2d9bef43938a1f3c00a75ca3f25b49a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Apr 2023 08:46:31 +0200 Subject: [PATCH 66/75] python310Packages.aqualogic: 3.3 -> 3.4 --- pkgs/development/python-modules/aqualogic/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aqualogic/default.nix b/pkgs/development/python-modules/aqualogic/default.nix index 8a6037213f7e..9b904033b7c6 100644 --- a/pkgs/development/python-modules/aqualogic/default.nix +++ b/pkgs/development/python-modules/aqualogic/default.nix @@ -9,26 +9,26 @@ buildPythonPackage rec { pname = "aqualogic"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "swilson"; repo = pname; rev = version; - hash = "sha256-6YvkSUtBc3Nl/Ap3LjU0IKY2bE4k86XdSoLo+/c8dDs="; + hash = "sha256-hBg02Wypd+MyqM2SUD53djhm5OMP2QAmsp8Stf+UT2c="; }; propagatedBuildInputs = [ + aiohttp pyserial websockets ]; nativeCheckInputs = [ - aiohttp pytestCheckHook ]; - # With 3.3 the event loop is not terminated after the first test + # With 3.4 the event loop is not terminated after the first test # https://github.com/swilson/aqualogic/issues/9 doCheck = false; From e9dadae2c6487e02cf791348dad522cd65df0b33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Apr 2023 08:49:59 +0200 Subject: [PATCH 67/75] python310Packages.mcstatus: 10.0.2 -> 10.0.3 Diff: https://github.com/py-mine/mcstatus/compare/refs/tags/v10.0.2...v10.0.3 Changelog: https://github.com/py-mine/mcstatus/releases/tag/v10.0.3 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index bbd364267549..9b9eef88eae1 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "10.0.2"; + version = "10.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8RdJarRoBOkHZfFAKnDgqu8dANQLwKAoY2g8SwbuDeE="; + hash = "sha256-LHcLqP9IGqi0YmjgFoTwojyS+IZmBOBujYWMPuqNc6w="; }; nativeBuildInputs = [ From d3648861353cf50fa8e315c4b2998ac1dbb92858 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 18 Apr 2023 08:52:29 +0200 Subject: [PATCH 68/75] python310Packages.meraki: add changelog to meta --- pkgs/development/python-modules/meraki/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 530cca4d6d5e..392684539cc8 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides all current Meraki dashboard API calls to interface with the Cisco Meraki cloud-managed platform"; homepage = "https://github.com/meraki/dashboard-api-python"; + changelog = "https://github.com/meraki/dashboard-api-python/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dylanmtaylor ]; }; From d9f622af3386887b917e44d30cbd1096c6ece87b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Apr 2023 08:14:25 +0000 Subject: [PATCH 69/75] cloudfox: 1.10.2 -> 1.10.3 --- pkgs/tools/security/cloudfox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/cloudfox/default.nix b/pkgs/tools/security/cloudfox/default.nix index 7619b592a54f..0a92262bf6e7 100644 --- a/pkgs/tools/security/cloudfox/default.nix +++ b/pkgs/tools/security/cloudfox/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cloudfox"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "BishopFox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7xU99BqohfvUT23uW1l5thm20ZgeAPteR9xThuLR1AI="; + hash = "sha256-XLn2GwoVNPoGTgXZx/q9dEmWigKB1BNylzxO9dBT3Zg="; }; vendorHash = "sha256-v8rEsp2mDgfjCO2VvWNIxex8F350MDnZ40bR4szv+3o="; From 34eac2362be4364de5b7265e7ac42ebd6538a6b9 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 14 Apr 2023 07:26:15 -0400 Subject: [PATCH 70/75] python310Packages.ibis-framework: 4.1.0 -> 5.1.0 --- .../python-modules/ibis-framework/default.nix | 101 +++++++++++------- 1 file changed, 64 insertions(+), 37 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index d1196d4bc3b4..48f13602872e 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -5,18 +5,23 @@ , pythonOlder , pytestCheckHook , atpublic -, click +, bidict +, black , clickhouse-cityhash , clickhouse-driver , dask , datafusion +, db-dtypes , duckdb , duckdb-engine , filelock , geoalchemy2 , geopandas +, google-cloud-bigquery +, google-cloud-bigquery-storage , graphviz-nox , hypothesis +, importlib-resources , lz4 , multipledispatch , numpy @@ -24,83 +29,100 @@ , pandas , parsy , poetry-core -, poetry-dynamic-versioning +, polars +, pooch , psycopg2 , pyarrow -, pydantic +, pydata-google-auth +, pydruid , pymysql , pyspark , pytest-benchmark +, pytest-httpserver , pytest-mock , pytest-randomly , pytest-snapshot , pytest-xdist -, python +, python-dateutil , pytz , regex , rich , rsync , shapely +, snowflake-connector-python +, snowflake-sqlalchemy , sqlalchemy +, sqlalchemy-views , sqlglot , sqlite , toolz +, trino-python-client +, typing-extensions }: let - testBackends = [ - "datafusion" - "duckdb" - "pandas" - "sqlite" - ]; + testBackends = [ "datafusion" "duckdb" "pandas" "sqlite" ]; ibisTestingData = fetchFromGitHub { + name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - rev = "3c39abfdb4b284140ff481e8f9fbb128b35f157a"; - hash = "sha256-BZWi4kEumZemQeYoAtlUSw922p+R6opSWp/bmX0DjAo="; + rev = "8a59df99c01fa217259554929543e71c3bbb1761"; + hash = "sha256-NbgEe0w/qf9hCr9rRfIpyaH9pv25I8x0ykY7EJxDOuk="; }; in buildPythonPackage rec { pname = "ibis-framework"; - version = "4.1.0"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { + name = "ibis-source"; repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-ipnMymf+BOpG9iGWO47no47m4nLIBbqLdbzlevuxeBw="; + hash = "sha256-u3BBGdhWajZ5WtoBvNxmx76+orfHY6LX3IWAq/x2/9A="; }; + patches = [ + # fixes a small bug in the datafusion backend to reorder predicates + (fetchpatch { + name = "fix-datafusion-compilation.patch"; + url = "https://github.com/ibis-project/ibis/commit/009230421b2bc1f86591e8b850d37a489e8e4f06.patch"; + hash = "sha256-5NHkgc8d2bkOMpbY1vme1XgNfyHSr0f7BrR3JTTjjPI="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ atpublic + bidict multipledispatch numpy - packaging pandas parsy - poetry-dynamic-versioning - pydantic + pooch + python-dateutil pytz - regex rich + sqlglot toolz - ]; + typing-extensions + ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ] + ++ pooch.optional-dependencies.progress + ++ pooch.optional-dependencies.xxhash; nativeCheckInputs = [ pytestCheckHook - click filelock hypothesis pytest-benchmark + pytest-httpserver pytest-mock pytest-randomly pytest-snapshot @@ -112,15 +134,13 @@ buildPythonPackage rec { "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" - # these will be fixed in ibis-framework 5.0.0 - "--deselect=ibis/backends/tests/test_string.py::test_string" - "--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema" - "--deselect=ibis/backends/tests/test_client.py::test_list_databases" + # sqlalchemy2 breakage + "--deselect=ibis/tests/sql/test_sqlalchemy.py::test_tpc_h17" + # tries to download duckdb extensions + "--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite" + "--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite" ]; - # remove when sqlalchemy backend no longer uses deprecated methods - SQLALCHEMY_SILENCE_UBER_WARNING = 1; - # patch out tests that check formatting with black postPatch = '' find ibis/tests -type f -name '*.py' -exec sed -i \ @@ -131,8 +151,8 @@ buildPythonPackage rec { preCheck = '' set -eo pipefail - export IBIS_TEST_DATA_DIRECTORY - IBIS_TEST_DATA_DIRECTORY="ci/ibis-testing-data" + HOME="$TMPDIR" + export IBIS_TEST_DATA_DIRECTORY="ci/ibis-testing-data" mkdir -p "$IBIS_TEST_DATA_DIRECTORY" @@ -150,23 +170,30 @@ buildPythonPackage rec { passthru = { optional-dependencies = { - clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 sqlglot ]; - dask = [ dask pyarrow ]; + bigquery = [ db-dtypes google-cloud-bigquery google-cloud-bigquery-storage pydata-google-auth ]; + clickhouse = [ clickhouse-cityhash clickhouse-driver lz4 sqlalchemy ]; + dask = [ dask pyarrow regex ]; datafusion = [ datafusion ]; - duckdb = [ duckdb duckdb-engine pyarrow sqlalchemy sqlglot ]; + druid = [ pydruid sqlalchemy ]; + duckdb = [ duckdb duckdb-engine packaging pyarrow sqlalchemy sqlalchemy-views ]; geospatial = [ geoalchemy2 geopandas shapely ]; - mysql = [ sqlalchemy pymysql sqlglot ]; - pandas = [ ]; - postgres = [ psycopg2 sqlalchemy sqlglot ]; - pyspark = [ pyarrow pyspark ]; - sqlite = [ sqlalchemy sqlite sqlglot ]; + mysql = [ sqlalchemy pymysql sqlalchemy-views ]; + pandas = [ regex ]; + polars = [ polars pyarrow ]; + postgres = [ psycopg2 sqlalchemy sqlalchemy-views ]; + pyspark = [ pyarrow pyspark sqlalchemy ]; + snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views ]; + sqlite = [ regex sqlalchemy sqlite sqlalchemy-views ]; + trino = [ trino-python-client sqlalchemy sqlalchemy-views ]; visualization = [ graphviz-nox ]; + decompiler = [ black ]; }; }; meta = with lib; { description = "Productivity-centric Python Big Data Framework"; homepage = "https://github.com/ibis-project/ibis"; + changelog = "https://github.com/ibis-project/ibis/blob/${version}/docs/release_notes.md"; license = licenses.asl20; maintainers = with maintainers; [ costrouc cpcloud ]; }; From 282d879c0341129e7bf30e29b516cff542004c03 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 18:17:39 -0300 Subject: [PATCH 71/75] gavin-bc: fix configureFlags --- pkgs/tools/misc/gavin-bc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix index ade42a7d0d3a..7f1a78824674 100644 --- a/pkgs/tools/misc/gavin-bc/default.nix +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -9,7 +9,7 @@ assert lib.elem historyType [ "editline" "readline" "internal" ]; assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" ]; -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "gavin-bc"; version = "6.2.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation (self: { domain = "git.gavinhoward.com"; owner = "gavin"; repo = "bc"; - rev = self.version; + rev = finalAttrs.version; hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw="; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation (self: { configureFlags = [ "--disable-nls" - "--predefined-build-type=${historyType}" + "--predefined-build-type=${predefinedBuildType}" ] ++ (lib.optional (historyType == "editline") "--enable-editline") ++ (lib.optional (historyType == "readline") "--enable-readline"); From 47651eba67d099d863f54b5a7e11515d7c2cd137 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 19:53:00 -0300 Subject: [PATCH 72/75] gavin-bc: add meta.changelog --- pkgs/tools/misc/gavin-bc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix index 7f1a78824674..2de74484c6be 100644 --- a/pkgs/tools/misc/gavin-bc/default.nix +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://git.gavinhoward.com/gavin/bc"; description = "Gavin Howard's BC calculator implementation"; + changelog = "https://git.gavinhoward.com/gavin/bc/raw/tag/${finalAttrs.version}/NEWS.md"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.unix; From e956ce0a46ec1fa958ceff40e75531894e52ff70 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 16 Apr 2023 20:35:50 -0300 Subject: [PATCH 73/75] gavin-bc: 6.2.4 -> 6.5.0 --- pkgs/tools/misc/gavin-bc/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/gavin-bc/default.nix b/pkgs/tools/misc/gavin-bc/default.nix index 2de74484c6be..ad8364d41ce4 100644 --- a/pkgs/tools/misc/gavin-bc/default.nix +++ b/pkgs/tools/misc/gavin-bc/default.nix @@ -8,17 +8,17 @@ }: assert lib.elem historyType [ "editline" "readline" "internal" ]; -assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" ]; +assert lib.elem predefinedBuildType [ "BSD" "GNU" "GDH" "DBG" "" ]; stdenv.mkDerivation (finalAttrs: { pname = "gavin-bc"; - version = "6.2.4"; + version = "6.5.0"; src = fetchFromGitea { domain = "git.gavinhoward.com"; owner = "gavin"; repo = "bc"; rev = finalAttrs.version; - hash = "sha256-KQheSyBbxh2ROOvwt/gqhJM+qWc+gDS/x4fD6QIYUWw="; + hash = "sha256-V0L5OmpcI0Zu5JvESjuhp4wEs5Bu/CvjF6B5WllTEqo="; }; buildInputs = @@ -27,10 +27,11 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-nls" - "--predefined-build-type=${predefinedBuildType}" ] + ++ (lib.optional (predefinedBuildType != "") "--predefined-build-type=${predefinedBuildType}") ++ (lib.optional (historyType == "editline") "--enable-editline") - ++ (lib.optional (historyType == "readline") "--enable-readline"); + ++ (lib.optional (historyType == "readline") "--enable-readline") + ++ (lib.optional (historyType == "internal") "--enable-internal-history"); meta = { homepage = "https://git.gavinhoward.com/gavin/bc"; @@ -42,3 +43,4 @@ stdenv.mkDerivation (finalAttrs: { broken = stdenv.isDarwin; }; }) +# TODO: cover most of configure settings From b3927c2a0f89e0cab46b41e029ba9a2271896383 Mon Sep 17 00:00:00 2001 From: pacien Date: Tue, 18 Apr 2023 12:23:15 +0200 Subject: [PATCH 74/75] mercurial: 6.4.1 -> 6.4.2 Contains an important bug fix for data corruption. Release notes: https://wiki.mercurial-scm.org/Release6.4 --- pkgs/applications/version-management/mercurial/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 7e38dc24622c..5f2f9837cc01 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.4.1"; + version = "6.4.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-BbBZoMx/TnJhm+Vz56yunU15YU1HID0geNIXCsBH8K4="; + sha256 = "sha256-W59qPDX05GlchU73FCjPlGHKGlKfaRwG3G97SOe7MzU="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-1enrXgQbf2aoBmM8WeAZg1259pR0OhdZnEB4Ax5k2K8="; + sha256 = "sha256-dRajIqM91fESEm4EEa9qvS8h6/HlLZIJZztVGoS/G+M="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; From d2f4583edc1190820a0e3da837f9c6195a587f30 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 15 Apr 2023 12:51:53 +0000 Subject: [PATCH 75/75] virglrenderer: enable debug info --- pkgs/development/libraries/virglrenderer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index 81abbf8c40c5..42ce297d4563 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c="; }; + separateDebugInfo = true; + buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; nativeBuildInputs = [ cmake meson ninja pkg-config python3 ];