diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index f0e5dc9cbb9a..bbaa3fe839b1 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, darwin , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr , aixlog, popl , pulseaudioSupport ? false, libpulseaudio @@ -22,9 +22,13 @@ stdenv.mkDerivation rec { # not needed buildInputs = [ boost17x - alsa-lib asio avahi flac libogg libvorbis + asio avahi flac libogg libvorbis aixlog popl soxr - ] ++ lib.optional pulseaudioSupport libpulseaudio; + ] ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional stdenv.isDarwin [darwin.apple_sdk.frameworks.IOKit darwin.apple_sdk.frameworks.AudioToolbox]; + + TARGET=lib.optionalString stdenv.isDarwin "MACOS"; # Upstream systemd unit files are pretty awful, so we provide our own in a # NixOS module. It might make sense to get that upstreamed... @@ -39,6 +43,7 @@ stdenv.mkDerivation rec { description = "Synchronous multi-room audio player"; homepage = "https://github.com/badaix/snapcast"; maintainers = with maintainers; [ fpletz ]; + platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 8826c2191404..dcb5d6c9f326 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.23.1"; + version = "1.23.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JEPGCwC81nAIphinwD6qvrkipaHTs3/kroArgqht/fQ="; + sha256 = "sha256-/jkzwFBBwkfymxmD6bXj0ZAlN4RV+UERg2kRtDyIV94="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/pkgs/applications/misc/jot/default.nix b/pkgs/applications/misc/jot/default.nix new file mode 100644 index 000000000000..c6552e2d09fa --- /dev/null +++ b/pkgs/applications/misc/jot/default.nix @@ -0,0 +1,26 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "jot"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "araekiel"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-CgS9I05Om4JxAbPN0vxh2Y7dftIkVnZkRP7PY4kOfpw="; + }; + + cargoSha256 = "sha256-8nRO01/hUKT6Jt7/3Sw2+aLU6hITSNl6nn9UEAvfyJY="; + + meta = with lib; { + description = "Rapid note management for the terminal"; + homepage = "https://github.com/araekiel/jot"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + mainProgram = "jt"; + }; +} diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 1ba4fde22f78..4210c50499ac 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.7"; + version = "0.8.8"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-FMGNaA/a1IzF2T0k9LGCOvLK26SlxX2cCOn7dLD/o7c="; + sha256 = "sha256-0RVGTANlnzULusQPZ14+a6G5mK1ezDC9VfWWdNqNcs4="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2cd6b897d768..a7c7c30206fb 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.4.7"; + version = "1.5.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-GkgHvzo0sxBIgk5P/3Yr0eFiL0ZOc6QmwJaE3Ck2hPM="; + sha256 = "sha256-FjRrAswoE1yuDoR42U3ppzvEvFN6K/VBdQ0w99wXPtM="; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 894294ae24c5..41eef4e20457 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.10.4"; + version = "0.10.5"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-X6DJHH+ZBPw7iWVMa43HvVFh+LDn6shzOU1A2uiAYL4="; + sha256 = "sha256-yMhE3wKRbFHoL0vdFR8gMkNU7Su4FHbAwKQYADaaWpk="; }; propagatedBuildInputs = [ diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/data/fonts/cooper-hewitt/default.nix index 8783b1121738..19c68973a252 100644 --- a/pkgs/data/fonts/cooper-hewitt/default.nix +++ b/pkgs/data/fonts/cooper-hewitt/default.nix @@ -1,17 +1,21 @@ -{ lib, fetchzip }: +{ lib, stdenv, fetchzip }: -fetchzip { - name = "cooper-hewitt-2014-06-09"; +stdenv.mkDerivation { + pname = "cooper-hewitt"; + version = "unstable-2014-06-09"; - url = "https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + src = fetchzip { + url = "https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + hash = "sha256-bTlEXQeYNNspvnNdvQhJn6CNBrcSKYWuNWF/N6+3Vb0="; + }; - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/ + dontConfigure = true; + dontBuild = true; + + installPhase = '' + install -D -m 644 -t "$out/share/fonts/opentype" *.otf ''; - sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd"; - meta = with lib; { homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/"; description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches"; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index b6342141f383..1a4a0811ab7e 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "2712aaf8b4e5941ccc467326be418c19f4192703", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2712aaf8b4e5941ccc467326be418c19f4192703.tar.gz", - "sha256": "0gsy99iqazv1cg0vznvdzf8q3zm5flv5645jx3q78fmq1rdzqwny", - "msg": "Update from Hackage at 2022-09-25T05:09:53Z" + "commit": "7cabb43eb4c2b1e025cae32532e7c4a9dcc6b349", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7cabb43eb4c2b1e025cae32532e7c4a9dcc6b349.tar.gz", + "sha256": "0zlqb1s7cyrnl2dmasv2h8lbjxmb27vzlac2adkcnd9r0zfgxl1p", + "msg": "Update from Hackage at 2022-09-28T11:00:39Z" } diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index bffbbb6a36f4..90e570f7da40 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -34,7 +34,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202202"; + version = "202205"; patches = [ # pass targetPrefix as an env var @@ -50,7 +50,7 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d"; + sha256 = "sha256-5V3gXZoePxRVL0miV/ku/HILT7d06E8UI28XRx8vZjA="; }; nativeBuildInputs = [ pythonEnv ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d83d6fd30cc1..5945737a1530 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -99,7 +99,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "19n60rx4mpr52551mvm0i5kgy32099rvgnihvmh5np09n2f81c2r"; + sha256 = "0dw89528kzbisbilyx6ggrh25vslivyylr8xk4dc4cikhd6dkm7p"; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them # during the build process, we can delete it to prevent a hash @@ -1020,6 +1020,15 @@ self: super: { (super.stack.overrideScope (self: super: { # Needs Cabal-3.6 Cabal = self.Cabal_3_6_3_0; + # Official stack ships with hpack-0.35.0. Nixpkgs uses the same + # version of hpack so that users who get stack from Nixpkgs + # generate the same .cabal files as users who download official binaries + # of stack. + # + # dontCheck is used because one of the hpack tests appears to be + # incorrectly(?) failing: + # https://github.com/sol/hpack/issues/528 + hpack = dontCheck self.hpack_0_35_0; }))); # Too strict version bound on hashable-time. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 19ce347c467e..91d8f697b4f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1138,6 +1138,7 @@ broken-packages: - disjoint-containers - disjoint-set - disjoint-set-stateful + - disk-bytes - Dist - distance - distributed-closure @@ -2103,6 +2104,7 @@ broken-packages: - HDBC-postgresql-hstore - hdevtools - hdf + - hdf5 - hDFA - hdigest - hdis86 @@ -5294,6 +5296,7 @@ broken-packages: - twine - twirp - twisty + - twitchapi - twitter - twitter-feed - twitter-types @@ -5325,6 +5328,7 @@ broken-packages: - type-of-html-static - typeparams - type-prelude + - type-reflection - type-rig - types-compat - type-settheory diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2ad87ceb2c7b..a871d99cc9ab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -105,7 +105,11 @@ extra-packages: - aeson < 2 # required by pantry-0.5.2 - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - base16-bytestring < 1 # required for cabal-install etc. + - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 + - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 + - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 @@ -113,6 +117,8 @@ extra-packages: - dhall == 1.29.0 # required for ats-pkg - dhall == 1.38.1 # required for spago - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* + - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 + - fourmolu == 0.3.0.0 # 2022-09-21: needed for hls on ghc 8.8 - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 @@ -127,39 +133,34 @@ extra-packages: - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 + - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 + - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + - hpack == 0.35.0 # 2022-09-29: Needed for stack-2.9.1 - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-javascript == 0.7.0.0 # required by purescript + - lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2 + - lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 + - ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8 - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - pantry == 0.5.2.1 # needed for stack-2.7.3 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - sbv == 7.13 # required for pkgs.petrinizer + - stylish-haskell == 0.13.0.0 # 2022-09-19: needed for hls on ghc 8.8 - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 - - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 - - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 - - lsp == 1.4.0.0 # 2022-09-18: need for dhall-lsp-server 1.1.2 - - lsp-types == 1.4.0.1 # 2022-09-18: need for dhall-lsp-server 1.1.2 - - stylish-haskell == 0.13.0.0 # 2022-09-19: needed for hls on ghc 8.8 - - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - - fourmolu == 0.3.0.0 # 2022-09-21: needed for hls on ghc 8.8 - - ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8 - - hlint == 3.2.8 # 2022-09-21: needed for hls on ghc 8.8 - - hlint == 3.4.1 # 2022-09-21: needed for hls with ghc-lib-parser 9.2 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 2a6c9d5dabea..754d81b34a86 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -3045,6 +3045,7 @@ dont-distribute-packages: - product - prof2dot - progressbar + - project-forge - project-m36 - prolog-graph - prolog-graph-lib @@ -3054,7 +3055,6 @@ dont-distribute-packages: - propane - proplang - prosidyc - - proteome - proto-lens-descriptors - proto3-suite - proto3-wire @@ -3295,6 +3295,7 @@ dont-distribute-packages: - ruler - ruler-core - runtime-arbitrary + - runtime-instances - rv - s-expression - safe-coloured-text-gen diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index dc25fdb6c3ab..2b04d881b01d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -738,12 +738,33 @@ self: super: builtins.intersectAttrs super { testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or []; }) super.retrie_1_2_0_0; - haskell-language-server = overrideCabal (drv: { + haskell-language-server = let + # This wrapper will be included in the sdist in the next release, then we can remove this custom fetch. + abi-compat-check-wrapper = assert super.haskell-language-server.version == "1.8.0.0"; pkgs.fetchurl { + url = "https://raw.githubusercontent.com/haskell/haskell-language-server/c12379c57ab8f0abd606e9f397de54e508d024a0/bindist/wrapper.in"; + sha256 = "sha256-vHi6+s8/V4WJSCxIqjP+thumEpttokpCc+a823WEPPk="; + }; in + overrideCabal (drv: { # starting with 1.6.1.1 haskell-language-server wants to be linked dynamically # by default. Unless we reflect this in the generic builder, GHC is going to # produce some illegal references to /build/. enableSharedExecutables = true; - postInstall = "ln -s $out/bin/haskell-language-server $out/bin/haskell-language-server-${self.ghc.version}"; + # The shell script wrapper checks that the runtime ghc and its boot packages match the ghc hls was compiled with. + # This prevents linking issues when running TH splices. + postInstall = '' + mv "$out/bin/haskell-language-server" "$out/bin/.haskell-language-server-${self.ghc.version}-unwrapped" + BOOT_PKGS=`ghc-pkg-${self.ghc.version} --global list --simple-output` + ${pkgs.buildPackages.gnused}/bin/sed \ + -e "s!@@EXE_DIR@@!$out/bin!" \ + -e "s/@@EXE_NAME@@/.haskell-language-server-${self.ghc.version}-unwrapped/" \ + -e "s/@@GHC_VERSION@@/${self.ghc.version}/" \ + -e "s/@@BOOT_PKGS@@/$BOOT_PKGS/" \ + -e "s/@@ABI_HASHES@@/$(for dep in $BOOT_PKGS; do printf "%s:" "$dep" && ghc-pkg-${self.ghc.version} field $dep abi --simple-output ; done | tr '\n' ' ' | xargs)/" \ + -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html#how-to-install-haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \ + ${abi-compat-check-wrapper} > "$out/bin/haskell-language-server" + ln -s "$out/bin/haskell-language-server" "$out/bin/haskell-language-server-${self.ghc.version}" + chmod +x "$out/bin/haskell-language-server" + ''; testToolDepends = [ self.cabal-install pkgs.git ]; testTarget = "func-test"; # wrapper test accesses internet preCheck = '' diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 63331bf79492..fecfca2a0465 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -26408,8 +26408,8 @@ self: { pname = "aeson-yaml"; version = "1.1.0.1"; sha256 = "06x1l0a0dvzf8n2xmqny5qpsgdsl03xlh2z9x7wdxiykl8p4xd24"; - revision = "1"; - editedCabalFile = "16jz8x7dbc66vcnfam52pzxcic6c40rmixc5p1y3xds2f695i1xl"; + revision = "2"; + editedCabalFile = "1pylybgbj1z3b7yj6xig60w2x9j3ljr0s0pfxsrqdym2c65dv7ww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -37497,8 +37497,8 @@ self: { }: mkDerivation { pname = "autoapply"; - version = "0.4.1.1"; - sha256 = "1gpc08j5sq51kz1ysjnm50h89zd6g9r9grbc49jrrbnqirnnl6fl"; + version = "0.4.1.3"; + sha256 = "1glm68xs9rmh8hkrh5z4dvi455inxv1i8qljc3n0mk3dawp8vl6y"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base logict mtl template-haskell th-desugar transformers @@ -48361,7 +48361,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "brick_1_1" = callPackage + "brick_1_2" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck @@ -48370,8 +48370,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "1.1"; - sha256 = "1mnlm0vbbldih1h0i07mriqsinfkjqqkbrsyk2z20fa9wb8cam3k"; + version = "1.2"; + sha256 = "1gz42k0wb4adff3ddjfgc6jp3b5zrp8bg4jwksih6mbn6124zpyf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61088,6 +61088,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "cmark-gfm_0_2_5" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, cheapskate + , criterion, discount, HUnit, markdown, sundown, text + }: + mkDerivation { + pname = "cmark-gfm"; + version = "0.2.5"; + sha256 = "0la4sd0cmv3zmn0kygbd77dknyh55h0b0qx5jg883hqnvnhaq721"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + benchmarkHaskellDepends = [ + base blaze-html cheapskate criterion discount markdown sundown text + ]; + description = "Fast, accurate GitHub Flavored Markdown parser and renderer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -73780,8 +73798,8 @@ self: { ({ mkDerivation, base, constraints }: mkDerivation { pname = "data-compat"; - version = "0.1.0.3"; - sha256 = "1wfm561ird8hv0d52gfyx684xmvps90s4cly8knwwv31cz9r9vpg"; + version = "0.1.0.4"; + sha256 = "0cgm17zzfmmglnprgv91aqpm7n847qlajfz8gp7qqwjlg9xfmpy9"; libraryHaskellDepends = [ base constraints ]; description = "Define Backwards Compatibility Schemes for Arbitrary Data"; license = lib.licenses.mit; @@ -80308,6 +80326,8 @@ self: { pname = "diagrams-lib"; version = "1.4.5.3"; sha256 = "0h762gc9l4gsbx3r035mkfrwqblwshjaxk943bq277rw9d5vi7ic"; + revision = "1"; + editedCabalFile = "04ss5jkrddlh77gq331w9na3v3gyallqs84vvhj9pfmjcgkbsm1j"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -82356,6 +82376,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "disk-bytes" = callPackage + ({ mkDerivation, base, bytestring, containers, direct-sqlite + , directory, stm, text + }: + mkDerivation { + pname = "disk-bytes"; + version = "0.1.0.0"; + sha256 = "1qivk5aljfby3fwmw04yksh2v57l7z7asl5ddkjh13583y9343n8"; + libraryHaskellDepends = [ + base bytestring containers direct-sqlite directory stm text + ]; + benchmarkHaskellDepends = [ base bytestring text ]; + description = "On-disk storage, but referentially transparent"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "disk-free-space" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -85264,8 +85302,8 @@ self: { }: mkDerivation { pname = "downhill"; - version = "0.2.0.0"; - sha256 = "1n00s3wbip9a1qsfmcxpx8ggkah53jg6dw006q084jyf01klx9ii"; + version = "0.3.0.0"; + sha256 = "1y4idkv093zlvlr9wc30cmyi7qn16sk73p8cx3ivyvq3j36dgw0l"; libraryHaskellDepends = [ base containers reflection template-haskell th-abstraction transformers unordered-containers vector-space @@ -91133,6 +91171,8 @@ self: { pname = "env-guard"; version = "0.2"; sha256 = "0chgskm1893i17b7r704wh44b7wh0ig2jz7y43vznhnmchrc80al"; + revision = "1"; + editedCabalFile = "1x87690s257f4qsbda43mql7xaahih300qv5xzdkfxargi1wpbpy"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "Conditionally running IO actions based on environment variables"; @@ -98567,8 +98607,8 @@ self: { pname = "fin-int"; version = "0.2.0"; sha256 = "0ra5lcd3ybmv1a0l7bisjlgi7b8mywa6c6pj7n82ppyi6rqssdlh"; - revision = "3"; - editedCabalFile = "1lwdv6z1rk734y7ccb6igyxlwbaqriww9d4ra3l4n20bcasmwb6w"; + revision = "4"; + editedCabalFile = "1gs61m3qllgapsn7rhix1c0l91l6878glks6xdwy545byphr92cf"; libraryHaskellDepends = [ attenuation base data-default-class deepseq portray portray-diff QuickCheck sint @@ -98884,8 +98924,8 @@ self: { pname = "finite-table"; version = "0.1.0.1"; sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; - revision = "4"; - editedCabalFile = "0hpq9rf8ckvk7ffxrpl683n6g1dvlw05qhjj98hhyxzws0dggrd0"; + revision = "5"; + editedCabalFile = "0lrpv4nqipdxyd1iw3x6y5fi0bkl28yd0nh1r3m39qzdd8v99b5g"; libraryHaskellDepends = [ adjunctions base cereal data-default-class deepseq distributive fin-int indexed-traversable lens portray portray-diff short-vec @@ -105277,14 +105317,14 @@ self: { license = lib.licenses.mit; }) {}; - "fuzzy-time_0_2_0_2" = callPackage + "fuzzy-time_0_2_0_3" = callPackage ({ mkDerivation, base, containers, deepseq, megaparsec, text, time , validity, validity-time }: mkDerivation { pname = "fuzzy-time"; - version = "0.2.0.2"; - sha256 = "0r0fmkh33v65h000y9bwr7fjd1a50m8pgrsvmwf6g52f33i7ds7h"; + version = "0.2.0.3"; + sha256 = "13n2insf02d80jc4rrfgsj0ivb9lz9hfifz9796hz0cmbm1wxr2y"; libraryHaskellDepends = [ base containers deepseq megaparsec text time validity validity-time ]; @@ -113108,8 +113148,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "10.20220822"; - sha256 = "1qv3cb7p2zyc5mpcr4nfgzdmswfny5jbimd2ip7ygh71jlahrbfc"; + version = "10.20220927"; + sha256 = "1bqcaddw47g6i3z9g0iym5x7zy1q8fsirzqnjsa63n2bwm6zzplc"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -118859,8 +118899,8 @@ self: { }: mkDerivation { pname = "gpmf"; - version = "0.1.1.0"; - sha256 = "14xwfwy8d7nn15alllcs61zq0pa7llsjh18f7qd13b5qcf485mpx"; + version = "0.1.1.1"; + sha256 = "1yl84ghhif3h485gg618ig006kph7ifri0jmi0bwii7da4i1ahsi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121907,8 +121947,8 @@ self: { }: mkDerivation { pname = "h-gpgme"; - version = "0.6.1.0"; - sha256 = "0q80q7dx1nsgsy486g4k66kz83k0bsimz4bn3l5c2qwl1wvrm4c8"; + version = "0.6.2.0"; + sha256 = "1nk8pbm3158lr9qdwwbvn55ygpns46mdq4s6hjdb6vmsw4ksy28c"; libraryHaskellDepends = [ base bindings-gpgme bytestring data-default email-validate time transformers unix @@ -126178,26 +126218,25 @@ self: { license = lib.licenses.bsd3; }) {}; - "happstack-server_7_8_0" = callPackage + "happstack-server_7_8_0_1" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring , containers, directory, exceptions, extensible-exceptions , filepath, hslogger, html, HUnit, monad-control, mtl, network - , network-uri, old-locale, parsec, process, semigroups, sendfile - , syb, system-filepath, text, threads, time, transformers + , network-uri, old-locale, parsec, process, sendfile, syb + , system-filepath, text, threads, time, transformers , transformers-base, transformers-compat, unix, utf8-string, xhtml , zlib }: mkDerivation { pname = "happstack-server"; - version = "7.8.0"; - sha256 = "1d8fmxh5v4n5fqksprz1j374cibwihljr0515ngr5jh77lbplsim"; + version = "7.8.0.1"; + sha256 = "0bxgnsd0qawbd0yllrshdxm89g1vm4znrn5jwhbs86pmh205w3xy"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html monad-control mtl network network-uri old-locale parsec process - semigroups sendfile syb system-filepath text threads time - transformers transformers-base transformers-compat unix utf8-string - xhtml zlib + sendfile syb system-filepath text threads time transformers + transformers-base transformers-compat unix utf8-string xhtml zlib ]; testHaskellDepends = [ base bytestring containers HUnit parsec zlib @@ -131784,7 +131823,7 @@ self: { license = lib.licenses.mit; }) {}; - "hasql_1_6_1_3" = callPackage + "hasql_1_6_1_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-strict-builder, contravariant, contravariant-extras , dlist, gauge, hashable, hashtables, mtl, network-ip @@ -131795,8 +131834,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.6.1.3"; - sha256 = "0bqsv0g7kv2wb9inx7gbrasdyw03nyjjjdv1x8jghcdgz0nhb1jn"; + version = "1.6.1.4"; + sha256 = "1x3frmckky3yxi5p2p76v4cx9gv0hd2iyvd2mgd359cgdcvnlvzp"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-strict-builder contravariant dlist hashable hashtables mtl network-ip @@ -134009,6 +134048,29 @@ self: { broken = true; }) {}; + "hdf5" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, exceptions + , hdf5-serial, hspec, libffi, lifted-base, monad-control, primitive + , QuickCheck, tagged, temporary, transformers, vector + }: + mkDerivation { + pname = "hdf5"; + version = "1.8.10"; + sha256 = "05mpfbs1hcpm92yg8x75vn7j559ivm3gixc8qj8b3xk2mz30ckai"; + libraryHaskellDepends = [ + base bindings-DSL bytestring libffi lifted-base monad-control + primitive tagged transformers vector + ]; + libraryPkgconfigDepends = [ hdf5-serial ]; + testHaskellDepends = [ + base bytestring exceptions hspec QuickCheck temporary vector + ]; + description = "Haskell interface to the HDF5 scientific data storage library"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {hdf5-serial = null;}; + "hdf5-lite" = callPackage ({ mkDerivation, base, c2hs, containers, exceptions, ghc-prim, hdf5 , hspec, inline-c, primitive, QuickCheck, template-haskell, text @@ -144481,6 +144543,8 @@ self: { pname = "hpack"; version = "0.35.0"; sha256 = "1cii4bdn4rm2l3yw9vsv4ygn61zmalaa282iqg9rihys90nvrgf6"; + revision = "1"; + editedCabalFile = "1x0rmra2fpfzmhhw090iila2drfdmb1y28ybypmgbi0asa1zl751"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148994,8 +149058,8 @@ self: { }: mkDerivation { pname = "hslua-cli"; - version = "1.0.0"; - sha256 = "1db2fglg6i0pqx1n0sdrsf4p9h1sdmfswqmsrspif2jhkipbh64m"; + version = "1.2.0"; + sha256 = "0sbqc0r7qxnjwhpsj63pv6almwkwrmgs9yhvj3y8fshcrvsmdi6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161949,8 +162013,8 @@ self: { pname = "invertible-grammar"; version = "0.1.3.2"; sha256 = "14i0xf5j01j6ayvxix32qr2m0bz3818q26z3b4xyw41ikbhxmkp2"; - revision = "2"; - editedCabalFile = "0qcdc7sl4s53f682lfpisw5rknb9qap1c7qp00sl4a8qx39w101w"; + revision = "3"; + editedCabalFile = "0dg32s4rvdrfxyr4dd1rcmzyx7cd9fd7ksqyg98vhiacnd54y4ix"; libraryHaskellDepends = [ base bifunctors containers mtl prettyprinter profunctors semigroups tagged template-haskell text transformers @@ -161959,6 +162023,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "invertible-grammar_0_1_3_3" = callPackage + ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter + , profunctors, semigroups, tagged, template-haskell, text + , transformers + }: + mkDerivation { + pname = "invertible-grammar"; + version = "0.1.3.3"; + sha256 = "12jqd4n4wg2cl5zsmavxy8ci08q3lqzz8iljpl10a17qyr5araal"; + libraryHaskellDepends = [ + base bifunctors containers mtl prettyprinter profunctors semigroups + tagged template-haskell text transformers + ]; + description = "Invertible parsing combinators framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "invertible-hlist" = callPackage ({ mkDerivation, base, HList, invertible }: mkDerivation { @@ -182755,6 +182837,8 @@ self: { pname = "lucid"; version = "2.11.1"; sha256 = "13krwrvv0w24rnl7pc7qhv18c6030fkxpx7sxkffdm8sr9173xfw"; + revision = "1"; + editedCabalFile = "0wipmh3xcs00x8lbq5j780rdc2klfj67nzni21qc1pdbhr2whn9d"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers @@ -182914,6 +182998,8 @@ self: { pname = "lucid2"; version = "0.0.20220526"; sha256 = "004bmzwzxfq2pmp7wn1mrdwkw9fnyfnmvzymnwn8fczkq17w4csd"; + revision = "1"; + editedCabalFile = "1b4vh46z3imkxmw6mg5mh12zhckrjlkbw7m5ix75l5ryl26lqlsc"; libraryHaskellDepends = [ base blaze-builder bytestring containers mtl text transformers ]; @@ -207332,7 +207418,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_9_6_0" = callPackage + "opaleye_0_9_6_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -207342,8 +207428,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.9.6.0"; - sha256 = "1hzpahvpgx8yr6jhyjklj2bigcb2ia4vwcix6kx0i015zns0m04z"; + version = "0.9.6.1"; + sha256 = "0xk2ibdakzayqc8h72iq3gav9ism5sww4wiz0wxypm6landzikfr"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -224112,10 +224198,8 @@ self: { }: mkDerivation { pname = "portray-pretty"; - version = "0.1.0.2"; - sha256 = "1gh50r77yz1l8qkhdz96bds2l0d5zi75fkir27x3si406h7sdic9"; - revision = "3"; - editedCabalFile = "1602wqwdli0h1rmpf5pg5205pikfk9b7d1ss9jhxbwbs1qq6zcpf"; + version = "0.1.0.3"; + sha256 = "08gf384mqsxblxzmhr6ipskvipgbdgx72s3nmdhsld53spg5zhd5"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework @@ -224134,10 +224218,8 @@ self: { }: mkDerivation { pname = "portray-prettyprinter"; - version = "0.2.0"; - sha256 = "16g55vjcfawx1jxmgy3zgl6bqv67h831z00912fbfh878s1s24ic"; - revision = "3"; - editedCabalFile = "0iwl1g9jrkrvxl4b7bns09vfwrzpr6k475kmnhkija1wr0wkd4p9"; + version = "0.2.1"; + sha256 = "0dzhzrv6xq67sbf6ivisghlx4pq53h3qh859ai5rs6cikg6xfb7b"; libraryHaskellDepends = [ base portray portray-diff prettyprinter prettyprinter-ansi-terminal text @@ -224621,7 +224703,7 @@ self: { license = lib.licenses.mit; }) {}; - "postgresql-binary_0_13" = callPackage + "postgresql-binary_0_13_1" = callPackage ({ mkDerivation, aeson, base, binary-parser, bytestring , bytestring-strict-builder, containers, criterion, network-ip , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase @@ -224630,8 +224712,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.13"; - sha256 = "0pb4bzkhgw59y2l06gikwf6i8g9wfzkx5swmw9c8hdxdzcjzjb1k"; + version = "0.13.1"; + sha256 = "0l8rnsjmxskhlry1p34y1mfcrzwm382v4y2zcwsjhj5r09ihzkm2"; libraryHaskellDepends = [ aeson base binary-parser bytestring bytestring-strict-builder containers network-ip scientific text time transformers @@ -228861,6 +228943,25 @@ self: { broken = true; }) {inherit (pkgs) proj;}; + "project-forge" = callPackage + ({ mkDerivation, aeson, base, Blammo, bytestring, containers + , directory, filepath, pretty-simple, stache, tasty, tasty-hunit + , temporary, text, typed-process + }: + mkDerivation { + pname = "project-forge"; + version = "0.2.0.0"; + sha256 = "1zn5djbfxgh1sxmf7w91isjii6p7d1l0ik7jpim1id9fzvcn7yk7"; + libraryHaskellDepends = [ + aeson base Blammo bytestring containers directory filepath + pretty-simple stache temporary text typed-process + ]; + testHaskellDepends = [ aeson base filepath tasty tasty-hunit ]; + description = "A project initialization library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "project-m36" = callPackage ({ mkDerivation, aeson, async, attoparsec, barbies, base , base16-bytestring, base64-bytestring, binary, blaze-html @@ -229106,8 +229207,8 @@ self: { }: mkDerivation { pname = "prolude"; - version = "0.0.0.25"; - sha256 = "05bd9qsa1p471yh7hy0s29jzp5shng0qdgj4xsannqfv7gzd995q"; + version = "0.0.0.26"; + sha256 = "1pj6hk545jk2z2nxv9ian8y1057bziq72cljbv433zkvacb8j3dh"; libraryHaskellDepends = [ aeson base bytestring cassava containers esqueleto generic-random lens mongoDB network-uri persistent persistent-mongoDB QuickCheck @@ -229554,45 +229655,37 @@ self: { }) {inherit (pkgs) SDL2;}; "proteome" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , data-default-class, deepseq, directory, either, filepath - , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs - , pretty-terminal, prettyprinter, process, resourcet, ribosome - , safe, split, stm, strings, text, time, transformers, unliftio - , utf8-string + ({ mkDerivation, attoparsec, base, chiasma, chronos, exon, extra + , filepattern, Glob, lens, lens-regex-pcre, microlens + , nonempty-zipper, parsers, path, path-io, pcre-light, polysemy + , polysemy-chronos, polysemy-plugin, polysemy-process, prelate + , prettyprinter, raw-strings-qq, ribosome, ribosome-host + , ribosome-menu, stm-chans, streamly, streamly-process + , transformers, typed-process }: mkDerivation { pname = "proteome"; - version = "0.3.17.0"; - sha256 = "1v0pk4mh8r56lmpxmc91h93rwm81d488qy5k648v1qfmj0qmgl25"; + version = "0.9.10"; + sha256 = "13ixfabchia0gchgnn42458q28g5za3lpk5gqjwklf8zrq6hnlcd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet ribosome safe split stm strings text time transformers - unliftio utf8-string + attoparsec base chiasma chronos exon extra filepattern Glob lens + lens-regex-pcre microlens nonempty-zipper parsers path path-io + pcre-light polysemy polysemy-chronos polysemy-plugin + polysemy-process prelate prettyprinter raw-strings-qq ribosome + ribosome-host ribosome-menu stm-chans streamly streamly-process + transformers typed-process ]; executableHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet ribosome safe split stm strings text time transformers - unliftio utf8-string + base polysemy polysemy-plugin prelate ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring containers data-default-class - deepseq directory either filepath hslogger HTF lens messagepack - MissingH mtl nvim-hs pretty-terminal prettyprinter process - resourcet ribosome safe split stm strings text time transformers - unliftio utf8-string - ]; - description = "neovim project manager"; - license = lib.licenses.mit; + description = "Neovim Project Manager"; + license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; mainProgram = "proteome"; - }) {}; + broken = true; + }) {prelate = null; ribosome-menu = null;}; "proto-lens" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim @@ -236083,8 +236176,8 @@ self: { }: mkDerivation { pname = "rdf"; - version = "0.1.0.5"; - sha256 = "1jrnmy9fdj3d3pnhycxl5smn6pjdm44b862wfp6hlb82vyl4556s"; + version = "0.1.0.6"; + sha256 = "0ghnmqzb0874fwhwv301n8scdxkq8x7b68fbwiqsqiym45ms33sf"; libraryHaskellDepends = [ attoparsec base bytestring deepseq dlist fgl text transformers ]; @@ -238781,8 +238874,8 @@ self: { pname = "reflex-gi-gtk"; version = "0.2.0.0"; sha256 = "0dx9g5v5i0fhxn1kn6fsj8hpwnax8wq89drsv8q2fwk9pxd8i384"; - revision = "2"; - editedCabalFile = "0k0bnmwpss3j6zgrh4l576qx81khzv18g0n9hmzajfwjwp9ifwmz"; + revision = "4"; + editedCabalFile = "0flxgiqxv9xa6cll4zli6gi8m24vn30jglrhah3f4kz1yb7shgbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246410,6 +246503,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "runtime-instances" = callPackage + ({ mkDerivation, base, containers, sop-core, tasty, tasty-hunit + , template-haskell, th-utilities, type-reflection + }: + mkDerivation { + pname = "runtime-instances"; + version = "1.0"; + sha256 = "0q8nb65djg2cav7i930swja0mgll6hmzcmhn50zq9i1rdvywrdmf"; + libraryHaskellDepends = [ + base containers sop-core template-haskell th-utilities + type-reflection + ]; + testHaskellDepends = [ base tasty tasty-hunit type-reflection ]; + description = "Look up class instances at runtime"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "rustls" = callPackage ({ mkDerivation, async, base, bytestring, containers , derive-storable, derive-storable-plugin, directory, filepath @@ -256109,6 +256220,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "sexp-grammar_2_3_4_0" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , criterion, data-fix, deepseq, happy, invertible-grammar + , prettyprinter, QuickCheck, recursion-schemes, scientific + , semigroups, tasty, tasty-hunit, tasty-quickcheck, text + , utf8-string + }: + mkDerivation { + pname = "sexp-grammar"; + version = "2.3.4.0"; + sha256 = "1gcddb714k3lia3z1wa92ar16jl0bb1l3sal1j4as2k3ccfaq7m7"; + libraryHaskellDepends = [ + array base bytestring containers data-fix deepseq + invertible-grammar prettyprinter recursion-schemes scientific + semigroups text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring containers invertible-grammar prettyprinter + QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck + text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq text + ]; + description = "Invertible grammar combinators for S-expressions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sexp-show" = callPackage ({ mkDerivation, base, pretty-show }: mkDerivation { @@ -257801,8 +257942,8 @@ self: { pname = "short-vec"; version = "0.1.0.0"; sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; - revision = "7"; - editedCabalFile = "02ycid229dkn3df7r0maib1qci268pyw005lmlsz7drw0isw2jh3"; + revision = "8"; + editedCabalFile = "1wvgdav62yixqarv0vlgwhfry7w6vb5z9w9y5330nbf6f286fqfj"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive fin-int indexed-traversable integer-gmp portray portray-diff QuickCheck @@ -260159,8 +260300,8 @@ self: { pname = "sint"; version = "0.2.0"; sha256 = "108za6vamb75kd6s2m0iin1gk6b1azk11jzsj841r7j62rhjn1qx"; - revision = "2"; - editedCabalFile = "0asf2kgxx4xzhqksz9hnzivay961x6n013l3hhrmsr8krzjv0xh1"; + revision = "3"; + editedCabalFile = "1jmy1na42y5mbq4gbk7bb2ny81si903l9wj4j0wvckbqllv3xqim"; libraryHaskellDepends = [ base portray portray-diff ]; testHaskellDepends = [ base portray portray-diff QuickCheck test-framework @@ -272839,29 +272980,29 @@ self: { ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, file-embed, filepath, ghc-lib-parser , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl - , optparse-applicative, random, strict, syb, test-framework - , test-framework-hunit, text + , optparse-applicative, random, regex-tdfa, strict, syb + , test-framework, test-framework-hunit, text }: mkDerivation { pname = "stylish-haskell"; - version = "0.14.2.0"; - sha256 = "1k2ffsizpy476v3zj6j634ap62qklzv80ryyh7c3j5l2cbzfv0gi"; + version = "0.14.3.0"; + sha256 = "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring Cabal containers directory file-embed filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson mtl - syb text + regex-tdfa syb text ]; executableHaskellDepends = [ aeson base bytestring Cabal containers directory file-embed filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson mtl - optparse-applicative strict syb text + optparse-applicative regex-tdfa strict syb text ]; testHaskellDepends = [ aeson base bytestring Cabal containers directory file-embed filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson HUnit - mtl random syb test-framework test-framework-hunit text + mtl random regex-tdfa syb test-framework test-framework-hunit text ]; description = "Haskell code prettifier"; license = lib.licenses.bsd3; @@ -274089,8 +274230,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.0.1.0"; - sha256 = "10a5bcbm28fnkrr6cfzfqwsm8lz8rpwdbsgbr8w40bwdgn8v5r06"; + version = "2.1.0.1"; + sha256 = "1xa9pyw567qcrphzr0srbxvmczdmg961gybaw66cv94l121h2bkl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277590,25 +277731,25 @@ self: { }) {}; "talash" = callPackage - ({ mkDerivation, alfred-margaret, base, brick, bytestring - , colorful-monoids, directory, ghc-compact, intro, microlens - , microlens-th, text, unix, unordered-containers, vector - , vector-algorithms, vector-sized, vty + ({ mkDerivation, alfred-margaret, base, bitvec, brick, bytestring + , colorful-monoids, containers, directory, extra, ghc-compact + , io-streams, microlens, microlens-th, mtl, primitive, safe, text + , unix, unordered-containers, vector, vector-algorithms + , vector-sized, vector-th-unbox, vty }: mkDerivation { pname = "talash"; - version = "0.1.1.1"; - sha256 = "0sa4ay2dc4srh5wbk72iznjwr5bjjhggafhf27zyyxjhnjvfgsq1"; - revision = "1"; - editedCabalFile = "0p635l2dr0wdfmqpx85wd6x2wq7n50m2n59rjin9fk1jg9qd869m"; + version = "0.3.0"; + sha256 = "0bmsii6i5lsjrf9n5qwh0bdxb3czvmq5mn96pkhpakgqvg8n48qy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - alfred-margaret base brick bytestring colorful-monoids directory - ghc-compact intro microlens microlens-th text unix - unordered-containers vector vector-algorithms vector-sized vty + alfred-margaret base bitvec brick bytestring colorful-monoids + containers directory extra ghc-compact io-streams microlens + microlens-th mtl primitive safe text unix unordered-containers + vector vector-algorithms vector-sized vector-th-unbox vty ]; - executableHaskellDepends = [ base intro ]; + executableHaskellDepends = [ base ]; description = "Line oriented fast enough text search"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; @@ -279000,8 +279141,8 @@ self: { }: mkDerivation { pname = "tasty-tmux"; - version = "0.1.0.3"; - sha256 = "0qq8q31vzmh1ssiiwkaacw0n7kmjqff8w74n8vyjypbxmsq4gwq1"; + version = "0.1.0.4"; + sha256 = "08a9zzzwq87p0bnb0x18xgqag2lfni9x6x74i8yrbb0b5pj22ixy"; libraryHaskellDepends = [ base bytestring mtl regex-posix tasty tasty-hunit text typed-process @@ -291414,6 +291555,27 @@ self: { license = lib.licenses.mit; }) {}; + "twitchapi" = callPackage + ({ mkDerivation, aeson, base, bytestring, hoauth2, hspec + , http-client, QuickCheck, text, time, timerep, uri-bytestring + }: + mkDerivation { + pname = "twitchapi"; + version = "0.0.1"; + sha256 = "14yy5hbz1mxrr4pxwy62vslyx0rjkq7flmglrx5h7vzijc240jf7"; + libraryHaskellDepends = [ + aeson base bytestring hoauth2 http-client text time timerep + uri-bytestring + ]; + testHaskellDepends = [ + aeson base bytestring hspec QuickCheck text time timerep + ]; + description = "Client access to Twitch.tv API endpoints"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "twitter" = callPackage ({ mkDerivation, base, curl, directory, filepath, json, mtl , old-locale, readline, time, xml @@ -292248,6 +292410,21 @@ self: { broken = true; }) {}; + "type-reflection" = callPackage + ({ mkDerivation, base, hashable, sop-core, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "type-reflection"; + version = "1.0"; + sha256 = "1vv1x44lzhbc0l6sf1n3iwb50x122k94whn9gd04whk0mgxk8h05"; + libraryHaskellDepends = [ base hashable sop-core text ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Support functions to work with type representations"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "type-rig" = callPackage ({ mkDerivation, base, invariant }: mkDerivation { @@ -294410,6 +294587,25 @@ self: { license = lib.licenses.asl20; }) {}; + "unicode-data_0_3_1" = callPackage + ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty + , tasty-bench + }: + mkDerivation { + pname = "unicode-data"; + version = "0.3.1"; + sha256 = "0q2wygqg0z9b22gzi083cxm73a8iz14zqvdsjmix9i57jxa827xy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; + description = "Access Unicode Character Database (UCD)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "unicode-data-names" = callPackage ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty , tasty-bench, unicode-data @@ -294428,6 +294624,40 @@ self: { license = lib.licenses.asl20; }) {}; + "unicode-data-scripts" = callPackage + ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty + , tasty-bench, unicode-data + }: + mkDerivation { + pname = "unicode-data-scripts"; + version = "0.1.0"; + sha256 = "0qj2wlk85cflmpxzhgsbykqvxfis8jnp4ylpiag5wvn7ppn05040"; + libraryHaskellDepends = [ base unicode-data ]; + testHaskellDepends = [ base hspec unicode-data ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base deepseq tasty tasty-bench unicode-data + ]; + description = "Unicode characters scripts"; + license = lib.licenses.asl20; + }) {}; + + "unicode-data-security" = callPackage + ({ mkDerivation, base, deepseq, hspec, hspec-discover, tasty + , tasty-bench, unicode-data + }: + mkDerivation { + pname = "unicode-data-security"; + version = "0.1.0"; + sha256 = "0vi1mvlzk6w11dc77hr5yq5aficisszf4mig5nrq0kp68s2jk5lv"; + libraryHaskellDepends = [ base unicode-data ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base deepseq tasty tasty-bench ]; + description = "Unicode security mechanisms database"; + license = lib.licenses.asl20; + }) {}; + "unicode-general-category" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , file-embed, hspec, QuickCheck, text @@ -303752,35 +303982,35 @@ self: { license = lib.licenses.mit; }) {}; - "warp_3_3_22" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + "warp_3_3_23" = callPackage + ({ mkDerivation, array, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, hspec-discover, http-client, http-date - , http-types, http2, HUnit, iproute, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, unliftio, vault, wai, word8, x509 + , http-types, http2, iproute, network, process, QuickCheck, recv + , simple-sendfile, stm, streaming-commons, text, time-manager, unix + , unix-compat, unliftio, vault, wai, word8, x509 }: mkDerivation { pname = "warp"; - version = "3.3.22"; - sha256 = "0gjgy2ilsldzqvv4gnaapvg1ijf5ri8wav240j6vr1igl5pkh9pa"; + version = "3.3.23"; + sha256 = "0y1r7czq5zrgklqrx1b9pmxn5lhmf7zpqdjz7hfmnzsmr3vndmms"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute - network simple-sendfile stm streaming-commons text time-manager - unix unix-compat unliftio vault wai word8 x509 + network recv simple-sendfile stm streaming-commons text + time-manager unix unix-compat unliftio vault wai word8 x509 ]; testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute network - process QuickCheck simple-sendfile stm streaming-commons text time - time-manager unix unix-compat unliftio vault wai word8 x509 + array auto-update base bsb-http-chunked bytestring case-insensitive + containers directory ghc-prim hashable hspec http-client http-date + http-types http2 iproute network process QuickCheck recv + simple-sendfile stm streaming-commons text time-manager unix + unix-compat unliftio vault wai word8 x509 ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat unliftio x509 + http-types network recv time-manager unix unix-compat unliftio x509 ]; description = "A fast, light-weight web server for WAI applications"; license = lib.licenses.mit; @@ -303893,15 +304123,15 @@ self: { license = lib.licenses.mit; }) {}; - "warp-tls_3_3_3" = callPackage + "warp-tls_3_3_4" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, unliftio , wai, warp }: mkDerivation { pname = "warp-tls"; - version = "3.3.3"; - sha256 = "18397xyl1awb040m9qkjz44ifzgd00hib70v1lrkp1ivj1xbwi2w"; + version = "3.3.4"; + sha256 = "00vgs9v7k0fapl05knqii9g47svf4lapb7ixkll7xr4zvmkk0r0m"; libraryHaskellDepends = [ base bytestring cryptonite data-default-class network streaming-commons tls tls-session-manager unliftio wai warp @@ -307146,8 +307376,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "word-compat"; - version = "0.0.5"; - sha256 = "0wllk017f02r1prsvzq1qbcr6w6br2pwii4b8xzr7bqkkri0z6rs"; + version = "0.0.6"; + sha256 = "12i7zd1q4dib9anf9dwpavn9dlj5r2dsmawviidcss5bkagjlp1h"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ]; description = "Compatibility shim for the Int/Word internal change in GHC 9.2"; @@ -308875,8 +309105,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.12.0"; - sha256 = "0vgxicqhzvhnbi6mn2bjw56pnvnqd4d49hn5q1fpjhjbpxxz5vgi"; + version = "0.12.1"; + sha256 = "0qpbm9jncpj7jy9xsbl1xy84mw2kmnfbd0m7g0qng80cifzvkqhi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310915,46 +311145,38 @@ self: { "xrefcheck" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring - , cmark-gfm, containers, data-default, deepseq, directory - , directory-tree, file-embed, filepath, fmt, Glob, hspec - , hspec-discover, http-client, http-types, HUnit, lens, modern-uri - , mtl, o-clock, optparse-applicative, pretty-terminal, QuickCheck - , regex-tdfa, req, roman-numerals, template-haskell, text - , text-metrics, th-lift-instances, th-utilities, transformers - , universum, with-utf8, yaml + , case-insensitive, cmark-gfm, containers, data-default, directory + , directory-tree, dlist, exceptions, filepath, firefly, fmt + , ftp-client, Glob, hspec, hspec-discover, hspec-expectations + , http-client, http-types, HUnit, lens, modern-uri, mtl, o-clock + , optparse-applicative, pretty-terminal, QuickCheck, raw-strings-qq + , regex-tdfa, req, roman-numerals, tagged, tagsoup, tasty + , tasty-discover, tasty-hunit, text, text-metrics + , th-lift-instances, time, transformers, universum, uri-bytestring + , with-utf8, yaml }: mkDerivation { pname = "xrefcheck"; - version = "0.1.3"; - sha256 = "0v7ylf21kky36shq1l33mlcsg2iihqwqx7bxyjlmhndp9hi0dr8l"; + version = "0.2.1"; + sha256 = "1xvz2qbchkb9p7prhc89gsmcwyl77spb0gxy9mw89c44wd12b9ns"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing async base bytestring cmark-gfm containers - data-default deepseq directory directory-tree file-embed filepath - fmt Glob http-client http-types HUnit lens modern-uri mtl o-clock - optparse-applicative pretty-terminal regex-tdfa req roman-numerals - template-haskell text text-metrics th-lift-instances th-utilities - transformers universum with-utf8 yaml - ]; - executableHaskellDepends = [ - aeson aeson-casing async base bytestring cmark-gfm containers - data-default deepseq directory directory-tree file-embed filepath - fmt Glob http-client http-types HUnit lens modern-uri mtl o-clock - optparse-applicative pretty-terminal regex-tdfa req roman-numerals - template-haskell text text-metrics th-lift-instances th-utilities - transformers universum with-utf8 yaml + data-default directory directory-tree dlist exceptions filepath fmt + ftp-client Glob http-client http-types lens modern-uri mtl o-clock + optparse-applicative pretty-terminal raw-strings-qq regex-tdfa req + roman-numerals tagsoup text text-metrics th-lift-instances time + transformers universum uri-bytestring yaml ]; + executableHaskellDepends = [ base bytestring universum with-utf8 ]; testHaskellDepends = [ - aeson aeson-casing async base bytestring cmark-gfm containers - data-default deepseq directory directory-tree file-embed filepath - fmt Glob hspec http-client http-types HUnit lens modern-uri mtl - o-clock optparse-applicative pretty-terminal QuickCheck regex-tdfa - req roman-numerals template-haskell text text-metrics - th-lift-instances th-utilities transformers universum with-utf8 - yaml + base bytestring case-insensitive cmark-gfm containers directory + firefly fmt hspec hspec-expectations http-types HUnit modern-uri + o-clock optparse-applicative QuickCheck regex-tdfa tagged tasty + tasty-hunit time universum uri-bytestring yaml ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ hspec-discover tasty-discover ]; license = lib.licenses.mpl20; hydraPlatforms = lib.platforms.none; mainProgram = "xrefcheck"; @@ -316643,8 +316865,8 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.4.2.1"; - sha256 = "1q9x2i8k6paf9r9jpqzw8rhrwxk1fagppfyv5psxr5amqks61lqp"; + version = "0.4.2.2"; + sha256 = "02b76hm76gqallij70z77xz1y981ig4biklzm0wgxran8d06n0d4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 877bc17298ee..c58c79415d40 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -42,6 +42,7 @@ base.withExtensions ({ all, ... }: with all; ([ sockets soap sodium + sysvsem sqlite3 tokenizer xmlreader diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 233706a436f0..aa190bc3866c 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -42,6 +42,7 @@ base.withExtensions ({ all, ... }: with all; ([ sockets soap sodium + sysvsem sqlite3 tokenizer xmlreader diff --git a/pkgs/development/interpreters/wasm3/default.nix b/pkgs/development/interpreters/wasm3/default.nix index b16dc78ac08e..036010e1356a 100644 --- a/pkgs/development/interpreters/wasm3/default.nix +++ b/pkgs/development/interpreters/wasm3/default.nix @@ -29,5 +29,18 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ malbarbo ]; license = licenses.mit; + knownVulnerabilities = [ + # wasm3 expects all wasm code to be pre-validated, any users + # should be aware that running unvalidated wasm will potentially + # lead to RCE until upstream have added a builtin validator + "CVE-2022-39974" + "CVE-2022-34529" + "CVE-2022-28990" + "CVE-2022-28966" + "CVE-2021-45947" + "CVE-2021-45946" + "CVE-2021-45929" + "CVE-2021-38592" + ]; }; } diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index a2812a9c6677..cb734508b340 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { # AArch64 has configurable page size up to 64k. The default configuration # for jemalloc only supports 4k page sizes. ++ lib.optional stdenv.isAarch64 "--with-lg-page=16" + # See https://github.com/jemalloc/jemalloc/issues/1997 + # Using a value of 48 should work on both emulated and native x86_64-darwin. + ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) "--with-lg-vaddr=48" ; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=array-bounds"; diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 86f0c8f40055..eddcf008787c 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-PqxwWPK5eBcS5d6e0CL4uZHybDye1K8pxniKU99YSAE="; + sha256 = "sha256-gDY5uEvV5nNPObrar5Fq2UTW30UZ71CooUwQVJkq4l8="; }; postPatch = '' diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index a8c97bb5b49b..f5672167336e 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "wxSVG"; - version = "1.5.23"; + version = "1.5.24"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/wxsvg-${version}.tar.bz2"; - hash = "sha256-Pwc2H6zH0YzBmpQN1zx4FC7V7sOMFNmTqFvwwGHcq7k="; + hash = "sha256-rkcykfjQpf6voGzScMgmxr6tS86yud1vzs8tt8JeJII="; }; nativeBuildInputs = [ diff --git a/pkgs/development/lisp-modules-new/ql.nix b/pkgs/development/lisp-modules-new/ql.nix index 2c164271984e..8e06ef75a1f6 100644 --- a/pkgs/development/lisp-modules-new/ql.nix +++ b/pkgs/development/lisp-modules-new/ql.nix @@ -32,7 +32,7 @@ let nativeLibs = [ glib gobject-introspection ]; }; cl-mysql = pkg: { - nativeLibs = [ mysql-client ]; + nativeLibs = [ mariadb.client ]; }; clsql-postgresql = pkg: { nativeLibs = [ postgresql.lib ]; @@ -44,7 +44,7 @@ let nativeLibs = [ webkitgtk ]; }; dbd-mysql = pkg: { - nativeLibs = [ mysql-client ]; + nativeLibs = [ mariadb.client ]; }; lla = pkg: { nativeLibs = [ openblas ]; diff --git a/pkgs/development/ocaml-modules/checkseum/default.nix b/pkgs/development/ocaml-modules/checkseum/default.nix index fd35b468cc6f..0b14aa57c749 100644 --- a/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/pkgs/development/ocaml-modules/checkseum/default.nix @@ -6,14 +6,14 @@ }: buildDunePackage rec { - version = "0.3.4"; + version = "0.4.0"; pname = "checkseum"; minimalOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-${version}.tbz"; - sha256 = "sha256-BL4BOwxXORrkOOba4QjRSetm8bF9JmlKHSFPq24+1zg="; + sha256 = "sha256-K6QPMts5+hxH2a+WQ1N0lwMBoshG2T0bSozNgzRvAlo="; }; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index a422f7ab99b7..ef40a07628a6 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -28,7 +28,7 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.4.8"; + version = "1.4.9"; minimalOCamlVersion = "4.10"; @@ -36,7 +36,7 @@ buildDunePackage rec { owner = "logseq"; repo = "mldoc"; rev = "v${version}"; - sha256 = "sha256-263/TQ8+Ihv6bCWnq4hA5Yk6mtokb3312dJrJ8U1QQs="; + sha256 = "sha256-jKZ4ejskngXb03EnHBlqRKC5xeNHJ32n73y1zQP9CiM="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index d69df70f772f..3f06a098d0e1 100644 --- a/pkgs/development/ocaml-modules/otoml/default.nix +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -8,9 +8,7 @@ buildDunePackage rec { pname = "otoml"; - version = "1.0.1"; - - useDune2 = true; + version = "1.0.2"; minimalOCamlVersion = "4.08"; @@ -18,7 +16,7 @@ buildDunePackage rec { owner = "dmbaturin"; repo = pname; rev = version; - sha256 = "sha256-2WGuq4ZLbLvfG6WZ3iimiSMqMYHCuruZc1EttZ/5rBE="; + sha256 = "sha256-Xd3fHBN1f+tvgRFCxD/Gz8/lIvezknz7Zy3EtdqoTEM="; }; strictDeps = true; @@ -29,6 +27,7 @@ buildDunePackage rec { meta = { description = "A TOML parsing and manipulation library for OCaml"; + changelog = "https://github.com/dmbaturin/otoml/raw/${version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index 104a74fa2a67..beebbf7a8175 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiopvapi"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "aio-powerview-api"; # no tags on git, no sdist on pypi: https://github.com/sander76/aio-powerview-api/issues/12 rev = "refs/tags/v${version}"; - sha256 = "sha256-QXWne6rTL1RjHemJJEuWX6HB2F5VSe7NJtnCpaew/xI="; + sha256 = "sha256-OengPrUBaYzpLSWEU9Jc6GLx863YJfqRe64676oQ81Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/casa-formats-io/default.nix b/pkgs/development/python-modules/casa-formats-io/default.nix index dc1032567288..799796a605cd 100644 --- a/pkgs/development/python-modules/casa-formats-io/default.nix +++ b/pkgs/development/python-modules/casa-formats-io/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "casa-formats-io"; - version = "0.2"; + version = "0.2.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-omDPTR/RRHosOF+ejZzuGUBO1LAN/SefNQsvnXxezOQ="; + sha256 = "sha256-8iZ+wcSfh5ACTb3/iQAf2qQpwZ6wExWwcdJoLmCEjB0="; }; nativeBuildInputs = [ setuptools-scm ]; @@ -33,4 +33,3 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ smaret ]; }; } - diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 1374a72abf74..ecea57b8b68a 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -14,18 +14,22 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.27"; + version = "0.8.28"; src = fetchPypi { inherit pname version; - sha256 = "e3a418d0d36874f7b6a1bf0b7461f3857fc13a525fd48ba34caed2fe8973aa26"; + sha256 = "sha256-7tr3Hy87vt/Ew42hrUiXRUzl69R5LhponJecKFPtwFo="; }; patches = [ - # This patch fixes compatibility with numpy 1.20. It will be in the next release - # after 0.8.27 + # should be included in next release (fetchpatch { - url = "https://github.com/scikit-learn-contrib/hdbscan/commit/5b67a4fba39c5aebe8187a6a418da677f89a63e0.patch"; - sha256 = "07d7jdwk0b8kgaqkifd529sarji01j1jiih7cfccc5kxmlb5py9h"; + name = "joblib-1.2.0-compat.patch"; + url = "https://github.com/scikit-learn-contrib/hdbscan/commit/d829c639923f6866e1917e46ddbde45b513913f3.patch"; + excludes = [ + "docs/basic_hdbscan.rst" + "docs/how_hdbscan_works.rst" + ]; + sha256 = "sha256-t0D4OsHEcMwmBZM8Mk1N0uAKi6ra+TOzEks9/efsvWI="; }) ]; diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index ad7db290d67e..caa306be7dc5 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -9,20 +9,21 @@ , lz4 , setuptools , sphinx +, psutil }: buildPythonPackage rec { pname = "joblib"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "4158fcecd13733f8be669be0683b96ebdbbd38d23559f54dca7205aea1bf1e35"; + sha256 = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg="; }; - checkInputs = [ sphinx numpydoc pytestCheckHook ]; + checkInputs = [ sphinx numpydoc pytestCheckHook psutil ]; propagatedBuildInputs = [ lz4 setuptools ]; pytestFlagsArray = [ "joblib/test" ]; diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 586f1ef96a1c..1aa838647ad0 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-+WZk2m05y/bYj8zSuWTzm+rnCC0L9H9WNQ2RLXv7hDk="; + hash = "sha256-7bYGMbNLAN48kfckCcNtnymvQHm9CSNsgy/soe14SII="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index a1c3df5150d4..fe6b2be16ea6 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.8.0"; + version = "2.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-oSz1MAvHf5yk7niIvlwHOJTMmemQaZeBZpBVvwJcmug="; + hash = "sha256-g5h+ZBQyosnt+hlbJF1DaX0HKTJoEtJ/JSGpto5ZXLs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 638e5002885b..ef43c46a0a44 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.2.3"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O7a94UC7AB7MiTTpf68PWfim9anfYEWbvgsQsTV74VA="; + sha256 = "sha256-jg2tsCkAAm7/NJ5wcwA/2E0GspM747WHwcXWnC0j1Q8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 3f92f8ec6a5b..f0ab9d147a46 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.3.1"; + version = "9.4.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-DDcUMuV72xo5jnHupNCTz8l1P+TgxOm82iFrdy1kwJo="; + sha256 = "sha256-hly2yjewKYx11kVfv1DX7Bfi5wFnmegP4rVKtEbkxYQ="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 92ad6aa452ea..f5853057d8e0 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -4,8 +4,6 @@ with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0-rc"; - useDune2 = true; - src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocaml-top"; @@ -20,6 +18,11 @@ with ocamlPackages; buildDunePackage rec { ocp-build -init ''; + postPatch = '' + substituteInPlace src/completion.ml \ + --replace 'LibIndex.load ' 'LibIndex.load ~qualify:false ' + ''; + meta = { homepage = "https://www.typerex.org/ocaml-top.html"; license = lib.licenses.gpl3; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index b055ccbde5dc..6c315960f985 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "ocp-index"; - version = "1.3.3"; + version = "1.3.4"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "sha256-ElCXjUR85tkyBLIpIKefDouE1upzJytQnk4xoQt/cb0="; + sha256 = "sha256-a7SBGHNKUstfrdHx9KI33tYpvzTwIGhs4Hfie5EeKww="; }; strictDeps = true; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 83d145f411f9..4b674de61faa 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -12,9 +12,9 @@ let jre = jre11; }; "2.8" = { - kafkaVersion = "2.8.1"; + kafkaVersion = "2.8.2"; scalaVersion = "2.13"; - sha256 = "0fgil47hxdnc374k0p9sxv6b163xknp3pkihv3r99p977czb1228"; + sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ="; jre = jre11; }; }; diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index c23e956972c2..1215fbd34094 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build time , autoreconfHook @@ -41,6 +42,14 @@ stdenv.mkDerivation rec { hash = "sha256-+M4xTdjCp5TJh0U8ZfUmw84Y7O0TZ9mmUXhh2J/QOE0="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-37032.patch"; + url = "https://github.com/FRRouting/frr/commit/ff6db1027f8f36df657ff2e5ea167773752537ed.patch"; + sha256 = "sha256-b3nT6xco620hMSqlj/nTWTJCegf3ARAGaQbii4Yq6Ag="; + }) + ]; + nativeBuildInputs = [ autoreconfHook bison diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 2b86df4f9d06..41fd1466fd35 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -9,11 +9,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "5.7.37"; + version = "5.7.39"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${pname}-${version}.tar.gz"; - sha256 = "sha256-qZqaqGNdJWbat2Sy3la+0XMDZdNg4guyf1Y5LOVOGL0="; + sha256 = "sha256-ERw6ypGJfkUwOds5GkdSZeAg/ZIcuXMHwACEqI5NYQQ="; }; preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch b/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch index 3872eb751406..d6a4ff8f2a78 100644 --- a/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch +++ b/pkgs/servers/web-apps/discourse/action_mailer_ca_cert.patch @@ -1,12 +1,12 @@ diff --git a/config/environments/production.rb b/config/environments/production.rb -index a523888a8d..422c2c1ee8 100644 +index 6b73c82e9d..0cefea6fc0 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb -@@ -32,6 +32,7 @@ Discourse::Application.configure do +@@ -32,5 +32,6 @@ Discourse::Application.configure do user_name: GlobalSetting.smtp_user_name, password: GlobalSetting.smtp_password, authentication: GlobalSetting.smtp_authentication, + ca_file: "/etc/ssl/certs/ca-certificates.crt", - enable_starttls_auto: GlobalSetting.smtp_enable_start_tls - } - + enable_starttls_auto: GlobalSetting.smtp_enable_start_tls, + open_timeout: GlobalSetting.smtp_open_timeout, + read_timeout: GlobalSetting.smtp_read_timeout \ No newline at end of file diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 6986cf5271e7..5035407c48db 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -11,13 +11,13 @@ }@args: let - version = "2.9.0.beta9"; + version = "2.9.0.beta10"; src = fetchFromGitHub { owner = "discourse"; repo = "discourse"; rev = "v${version}"; - sha256 = "sha256-pavNdAbk9yuWRg++p1MCmpBMuYKDs63QbJpHrPS9oAY="; + sha256 = "sha256-7uMcJZolLUoJILRYbmcSDArcMP3o89ubh6XttZ7TsLg="; }; runtimeDeps = [ @@ -161,7 +161,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/app/assets/javascripts/yarn.lock"; - sha256 = "14d7y29460ggqcjnc9vk1q2lnxfl6ycyp8rc103g3gs2bl5sb6r0"; + sha256 = "0s8cmy76xh4z9y932bjshmpyr04zn3yn62ld9174lks2j965qkbl"; }; assets = stdenv.mkDerivation { diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix index 8dc8377ac95e..b1ada2100f2e 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-assign"; - rev = "030cdc2d9c06cd2fed24fa47861b0213fd2d854e"; - sha256 = "sha256-3JBBxgWWkCAHci+Cv69o+4JY1b70yOckE+1y5ipl5a8="; + rev = "c5ad176aaf60150ff44a3f4dd01920ce57975551"; + sha256 = "sha256-AHymwpWcPlgcuJR5x3Ea+l2cuMJKXyNVBtZFJKjsNf4="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock index 4de4b6e42dde..3f85eae74422 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3.1) + activesupport (7.0.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -9,7 +9,7 @@ GEM concurrent-ruby (1.1.10) i18n (1.12.0) concurrent-ruby (~> 1.0) - minitest (5.16.2) + minitest (5.16.3) rrule (0.4.4) activesupport (>= 2.3) tzinfo (2.0.5) @@ -22,4 +22,4 @@ DEPENDENCIES rrule (= 0.4.4) BUNDLED WITH - 2.3.9 + 2.3.22 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix index 922adc60b618..7524e8c6da4b 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-calendar"; - rev = "3cf82dcc6c717965e1d1ff384965e2ee215402f0"; - sha256 = "sha256-D6FP+vgCqi+wLV+gFAPTAAND3os7mcvpl2z8c5JiFxo="; + rev = "d0908b9b2e80087dd6638e661c3307d8d384550e"; + sha256 = "sha256-zmoL4v3tdcPQUdLl+bcT4Kb7EDLVgJa9VVX9ofcPoHk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-calendar"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix index e2db1930298d..3b4dd7442030 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; + sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; type = "gem"; }; - version = "7.0.3.1"; + version = "7.0.4"; }; concurrent-ruby = { groups = ["default"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.16.2"; + version = "5.16.3"; }; rrule = { dependencies = ["activesupport"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix index 6f70efa90ab1..355162c0163c 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-chat-integration"; - rev = "c68fde5d2bbb92cad24a35ff61586453d67264f5"; - sha256 = "sha256-Gmy8I/MbIdicHqZjlwNDz8PdCdxptzynd1pyL4BM5z4="; + rev = "7bf7368520d37a2dca9c21dcffd8831d987f64f8"; + sha256 = "sha256-f0JgiuwSKtCfr+s3D4HVVWjyE/5sixqRDsgcvBJs8Uk="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-chat-integration"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix index 198b1e5aba52..6dd435246175 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-data-explorer"; - rev = "bf56ab3559328cdf89cdd5b32ec32f41aa87017e"; - sha256 = "sha256-JoqOmv/x9aiSXBAwXO1PSg0E/1eb19dNXxqCLOIyHvo="; + rev = "16bb6a946cc2014aa709aba60940a96b5452936d"; + sha256 = "sha256-E9qGAG4XWrxqP1SPq5LYQn89sQbX8DgGxtCfEQcBFX8="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-data-explorer"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix index 3587c9ef2a13..7ed0ba1ccc65 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-docs"; - rev = "13bab928c72c847c4c3f7ebb8600343b48f14a5f"; - sha256 = "sha256-Gno+dbu8/l/cdrzJZL82DmMilZ5zJScFaQ88x8Hum0k="; + rev = "9cffc3e479117af1665096e16b7d5a637b112b28"; + sha256 = "sha256-F74eFhDIdWbnCCsWsT3SrQBSS8IUPLi2N9w3h8i5++0="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-docs"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile index ae97d9198459..8b69b657f2ad 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile @@ -3,5 +3,5 @@ source "https://rubygems.org" # gem "rails" -gem 'sawyer', '0.8.2' -gem 'octokit', '4.22.0' +gem 'sawyer', '0.9.2' +gem 'octokit', '5.6.1' diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock index b31ad9452c4d..12c8201d7b40 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock @@ -1,47 +1,27 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - faraday (1.10.1) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) + faraday (2.5.2) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) - multipart-post (2.2.3) - octokit (4.22.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) - public_suffix (4.0.7) + faraday-net_http (3.0.0) + octokit (5.6.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) + public_suffix (5.0.0) ruby2_keywords (0.0.5) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) + faraday (>= 0.17.3, < 3) PLATFORMS ruby DEPENDENCIES - octokit (= 4.22.0) - sawyer (= 0.8.2) + octokit (= 5.6.1) + sawyer (= 0.9.2) BUNDLED WITH - 2.3.9 + 2.3.22 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix index e53ac21892b0..0edbe1c9f100 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-github"; - rev = "739bdf9ecc0bfe5256a4814fbc758168552ae069"; - sha256 = "sha256-pD6sqvUfHUb/5J0HpgqHmYsJnrFcB1ubZR/PMU/GApU="; + rev = "e513628acc716c8e35611d9a31fca8badf2757e2"; + sha256 = "sha256-K6FzV/r9i0rlOlek5AYZkwfV5diBtzBd5zLmMStcqAI="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-github"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix index ab21dcdc72fb..5c3d7e8ec703 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix @@ -5,132 +5,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "037w5kg3y9jrwgg7izfn1pmzngy0hdhcr7slmxwqa3mdb4rx9r9q"; + sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx"; type = "gem"; }; - version = "1.10.1"; - }; - faraday-em_http = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = ["multipart-post"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; - type = "gem"; - }; - version = "1.0.4"; + version = "2.5.2"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw"; type = "gem"; }; - version = "1.0.1"; - }; - faraday-net_http_persistent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-retry = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; - }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; - type = "gem"; - }; - version = "2.2.3"; + version = "3.0.0"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -138,20 +37,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj"; + sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8"; type = "gem"; }; - version = "4.22.0"; + version = "5.6.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; ruby2_keywords = { groups = ["default"]; @@ -169,9 +68,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yrdchs3psh583rjapkv33mljdivggqn99wkydkjdckcjn43j3cz"; + sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps"; type = "gem"; }; - version = "0.8.2"; + version = "0.9.2"; }; } diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock index 9ed9dcc8ef91..915a95cd8278 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: hashie (5.0.0) net-ldap (0.14.0) - omniauth (1.9.1) + omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-ldap (1.0.5) @@ -12,7 +12,7 @@ GEM pyu-ruby-sasl (~> 0.0.3.2) rubyntlm (~> 0.3.4) pyu-ruby-sasl (0.0.3.3) - rack (2.2.3) + rack (2.2.4) rubyntlm (0.3.4) PLATFORMS @@ -25,4 +25,4 @@ DEPENDENCIES rubyntlm (= 0.3.4) BUNDLED WITH - 2.3.9 + 2.3.22 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix index 0fc71fad2615..5e7ed51852e6 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "jonmbake"; repo = "discourse-ldap-auth"; - rev = "a7a2e35eb5a8f6ee3b90bf48424efcb2a66c9989"; - sha256 = "sha256-Dsb12bZEZlNjFGw1GX7zt2hDVM9Ua+MDWSmBn4HEvs0="; + rev = "84635b1c352b2145b8e6074d94047f1e2020dcbc"; + sha256 = "sha256-yCCSger7qa9R/BMaQdcFtLXqLPj3i3y4tTanz+ufZTw="; }; meta = with lib; { homepage = "https://github.com/jonmbake/discourse-ldap-auth"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix index 7d5816cf53cb..bea800d6b507 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/gemset.nix @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3"; + version = "2.2.4"; }; rubyntlm = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile index a00258a7e5af..565495d9e4e8 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" # gem "rails" -gem 'bcrypt', '3.1.3' +gem 'bcrypt', '3.1.13' gem 'unix-crypt', '1.3.0' gem 'ffi', '1.15.5', require: false gem 'ffi-compiler', '1.0.1', require: false diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock index 255d3f2d2401..1401a09405af 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock @@ -4,7 +4,7 @@ GEM argon2 (2.1.1) ffi (~> 1.14) ffi-compiler (~> 1.0) - bcrypt (3.1.3) + bcrypt (3.1.13) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -17,10 +17,10 @@ PLATFORMS DEPENDENCIES argon2 (= 2.1.1) - bcrypt (= 3.1.3) + bcrypt (= 3.1.13) ffi (= 1.15.5) ffi-compiler (= 1.0.1) unix-crypt (= 1.3.0) BUNDLED WITH - 2.3.9 + 2.3.22 diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix index 962c10ad7db5..99a316bcbf4f 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "communiteq"; repo = "discourse-migratepassword"; - rev = "7d33a57b4bd2a37badc64d5eca57d7ca01d62937"; - sha256 = "sha256-BDBXgsLVHYiSSjvN4Y13ffwfWk6nuVLoJE1YKgGmLTA="; + rev = "ebb705d2f86dea862d6492ae8da5ececca4fde1c"; + sha256 = "sha256-UByhKdIYvwlo8tA9JTK6EGKo7QGkcKIFBVgsgHGIFc0="; }; meta = with lib; { homepage = "https://github.com/communiteq/discourse-migratepassword"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix index 00877ed48199..d9471aea82a9 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2gqv8vry4ps0asb7nn1z4zxi3mcscy7yrim0npdd294ffyinvj"; + sha256 = "0ai0m15jg3n0b22mimk09ppnga316dc7dyvz06w8rrqh5gy1lslp"; type = "gem"; }; - version = "3.1.3"; + version = "3.1.13"; }; ffi = { groups = ["default"]; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix index e4624104179b..374d7ba3ac17 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix @@ -6,8 +6,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-openid-connect"; - rev = "6534ceb4529f86499b4a77300c851a7f69f016e0"; - sha256 = "sha256-25vVNH9HRddDTiwqPtFo2JdE1Fo3hNMjXn5GMWA1jzs="; + rev = "d3b347388d3e28a5c2ec7dfe8403e949928d5010"; + sha256 = "sha256-3rASzJgZeXY2oA7EpwPwgN7YiRSXGPCtJlhAIK1RCDw="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-openid-connect"; diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix index 5eaf0e18a6a6..fb7ce4855e73 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix @@ -5,8 +5,8 @@ mkDiscoursePlugin { src = fetchFromGitHub { owner = "discourse"; repo = "discourse-solved"; - rev = "e6cce5486df906ede74aa1b17ab308a145a99b88"; - sha256 = "sha256-hgoCPMlE5qJbdftwOW/zRcp8C7S0h/W2XrfFjLrNpgw="; + rev = "e96934d60f3fb97a949e0d901fd1c061e6c3bd71"; + sha256 = "sha256-DOFUTiTYffvrwmHkEuX5TGk0VL3iqSziXZ3ogsbkwjQ="; }; meta = with lib; { homepage = "https://github.com/discourse/discourse-solved"; diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile index b2116cc8ac3e..e29c6737bedd 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile @@ -149,11 +149,14 @@ group :assets do end group :test do + gem 'capybara', require: false gem 'webmock', require: false gem 'fakeweb', require: false gem 'minitest', require: false gem 'simplecov', require: false + gem 'selenium-webdriver', require: false gem "test-prof" + gem 'webdrivers', require: false end group :test, :development do @@ -170,7 +173,7 @@ group :test, :development do gem 'shoulda-matchers', require: false gem 'rspec-html-matchers' gem 'byebug', require: ENV['RM_INFO'].nil?, platform: :mri - gem 'rubocop-discourse', require: false, github: 'discourse/rubocop-discourse' + gem 'rubocop-discourse', require: false gem 'parallel_tests' gem 'rswag-specs' diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock index 95c706acab3f..b6392ce704a7 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock +++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock @@ -5,14 +5,6 @@ GIT mail (2.8.0.edge) mini_mime (>= 0.1.1) -GIT - remote: https://github.com/discourse/rubocop-discourse.git - revision: a5aea6e5f150b1eb7765a805bec0ff618cb718b3 - specs: - rubocop-discourse (2.5.0) - rubocop (>= 1.1.0) - rubocop-rspec (>= 2.0.0) - GEM remote: https://rubygems.org/ specs: @@ -56,8 +48,8 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) @@ -93,17 +85,27 @@ GEM bootsnap (1.13.0) msgpack (~> 1.2) builder (3.2.4) - bullet (7.0.2) + bullet (7.0.3) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) + capybara (3.37.1) + addressable + matrix + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + regexp_parser (>= 1.5, < 3.0) + xpath (~> 3.2) cbor (0.5.9.6) certified (1.0.0) + childprocess (4.1.0) chunky_png (1.4.0) coderay (1.1.3) colored2 (3.1.2) concurrent-ruby (1.1.10) - connection_pool (2.2.5) + connection_pool (2.3.0) cose (1.2.1) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) @@ -111,12 +113,11 @@ GEM crack (0.4.5) rexml crass (1.0.6) - css_parser (1.11.0) + css_parser (1.12.0) addressable debug_inspector (1.1.0) diff-lcs (1.5.0) diffy (3.4.2) - digest (3.1.0) discourse-ember-rails (0.18.6) active_model_serializers ember-data-source (>= 1.0.0.beta.5) @@ -140,36 +141,17 @@ GEM sprockets (>= 3.3, < 4.1) ember-source (2.18.2) erubi (1.11.0) - excon (0.92.4) + excon (0.92.5) execjs (2.8.1) exifr (1.3.9) fabrication (2.30.0) - faker (2.22.0) + faker (2.23.0) i18n (>= 1.8.11, < 2) fakeweb (1.3.0) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.5.2) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (3.0.0) fast_blank (1.0.1) fast_xs (0.8.0) fastimage (2.2.6) @@ -194,7 +176,7 @@ GEM image_size (>= 1.5, < 4) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_size (3.0.2) + image_size (3.1.0) in_threads (1.6.0) jmespath (1.6.1) jquery-rails (4.5.0) @@ -209,9 +191,14 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) - jwt (2.4.1) + jwt (2.5.0) kgio (2.11.4) libv8-node (16.10.0.0) + libv8-node (16.10.0.0-aarch64-linux) + libv8-node (16.10.0.0-arm64-darwin) + libv8-node (16.10.0.0-x86_64-darwin) + libv8-node (16.10.0.0-x86_64-darwin-19) + libv8-node (16.10.0.0-x86_64-linux) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -224,12 +211,13 @@ GEM logstash-event (1.2.02) logstash-logger (0.26.1) logstash-event (~> 1.2) - logster (2.11.2) - loofah (2.18.0) + logster (2.11.3) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) lz4-ruby (0.3.3) + matrix (0.4.2) maxminddb (0.1.22) memory_profiler (1.0.0) message_bus (4.2.0) @@ -237,49 +225,55 @@ GEM method_source (1.0.0) mini_mime (1.1.2) mini_portile2 (2.8.0) - mini_racer (0.6.2) + mini_racer (0.6.3) libv8-node (~> 16.10.0.0) mini_scheduler (0.14.0) sidekiq (>= 4.2.3) mini_sql (1.4.0) mini_suffix (0.3.3) ffi (~> 1.9) - minitest (5.16.2) - mocha (1.14.0) - msgpack (1.5.4) + minitest (5.16.3) + mocha (1.15.0) + msgpack (1.5.6) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.2.3) mustache (1.1.1) net-http (0.2.2) uri - net-imap (0.2.3) - digest + net-imap (0.3.0) net-protocol - strscan - net-pop (0.1.1) - digest + net-pop (0.1.2) net-protocol - timeout net-protocol (0.1.3) timeout - net-smtp (0.3.1) - digest + net-smtp (0.3.2) net-protocol - timeout nio4r (2.5.8) nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) - oauth (0.5.10) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + nokogiri (1.13.8-aarch64-linux) + racc (~> 1.4) + nokogiri (1.13.8-arm64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-darwin) + racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) + oauth (1.1.0) + oauth-tty (~> 1.0, >= 1.0.1) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + oauth-tty (1.0.3) + version_gem (~> 1.1) + oauth2 (1.4.11) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) + rack (>= 1.2, < 4) oj (3.13.14) - omniauth (1.9.1) + omniauth (1.9.2) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-facebook (9.0.0) @@ -295,40 +289,40 @@ GEM omniauth-oauth (1.2.0) oauth omniauth (>= 1.0, < 3) - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) omniauth (>= 1.9, < 3) omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - openssl (3.0.0) + openssl (3.0.1) openssl-signature_algorithm (1.2.1) openssl (> 2.0, < 3.1) optimist (3.0.1) parallel (1.22.1) - parallel_tests (3.11.1) + parallel_tests (3.13.0) parallel parser (3.1.2.1) ast (~> 2.4.1) pg (1.4.3) progress (3.6.0) - pry (0.13.1) + pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.13.0) + pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.7) - puma (5.6.4) + public_suffix (5.0.0) + puma (5.6.5) nio4r (~> 2.0) r2 (0.2.7) racc (1.6.0) rack (2.2.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-protection (2.2.2) + rack-protection (3.0.1) rack rack-test (2.0.2) rack (>= 1.3) @@ -354,7 +348,7 @@ GEM rainbow (3.1.1) raindrops (0.20.0) rake (13.0.6) - rb-fsevent (0.11.1) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rbtrace (0.4.14) @@ -363,9 +357,9 @@ GEM optimist (>= 3.0.0) rchardet (1.8.0) redis (4.7.1) - redis-namespace (1.8.2) - redis (>= 3.0.4) - regexp_parser (2.5.0) + redis-namespace (1.9.0) + redis (>= 4) + regexp_parser (2.6.0) request_store (1.5.1) rack (>= 1.4) rexml (3.2.5) @@ -381,7 +375,7 @@ GEM rspec-mocks (~> 3.11.0) rspec-core (3.11.0) rspec-support (~> 3.11.0) - rspec-expectations (3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.11.0) rspec-html-matchers (0.10.0) @@ -398,27 +392,30 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.11.0) + rspec-support (3.11.1) rss (0.2.9) rexml - rswag-specs (2.5.1) + rswag-specs (2.6.0) activesupport (>= 3.1, < 7.1) json-schema (~> 2.2) railties (>= 3.1, < 7.1) - rubocop (1.34.1) + rubocop (1.36.0) json (~> 2.3) parallel (~> 1.10) parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.20.0, < 2.0) + rubocop-ast (>= 1.20.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.21.0) parser (>= 3.1.1.0) - rubocop-rspec (2.12.1) - rubocop (~> 1.31) + rubocop-discourse (3.0) + rubocop (>= 1.1.0) + rubocop-rspec (>= 2.0.0) + rubocop-rspec (2.13.2) + rubocop (~> 1.33) ruby-prof (1.4.3) ruby-progressbar (1.11.0) ruby-readability (0.7.0) @@ -441,18 +438,26 @@ GEM seed-fu (2.3.9) activerecord (>= 3.1) activesupport (>= 3.1) - shoulda-matchers (5.1.0) + selenium-webdriver (4.5.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + shoulda-matchers (5.2.0) activesupport (>= 5.2.0) - sidekiq (6.5.4) - connection_pool (>= 2.2.2) + sidekiq (6.5.7) + connection_pool (>= 2.2.5) rack (~> 2.0) - redis (>= 4.5.0) + redis (>= 4.5.0, < 5) simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) simplecov-html (0.12.3) simplecov_json_formatter (0.1.4) + snaky_hash (2.0.0) + hashie + version_gem (~> 1.1) sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -461,9 +466,8 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sshkey (2.0.0) - stackprof (0.2.20) - strscan (3.0.4) - test-prof (1.0.9) + stackprof (0.2.21) + test-prof (1.0.10) thor (1.2.1) tilt (2.0.11) timeout (0.3.0) @@ -474,21 +478,29 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.2.0) + unicode-display_width (2.3.0) unicorn (6.1.0) kgio (~> 2.6) raindrops (~> 0.7) uniform_notifier (1.16.0) uri (0.11.0) uri_template (0.7.0) - webmock (3.17.1) + version_gem (1.1.0) + webdrivers (5.1.0) + nokogiri (~> 1.6) + rubyzip (>= 1.3.0) + selenium-webdriver (~> 4.0) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webpush (1.1.0) hkdf (~> 0.2) jwt (~> 2.0) + websocket (1.2.9) xorcist (1.1.3) + xpath (3.2.0) + nokogiri (~> 1.8) yaml-lint (0.0.10) zeitwerk (2.6.0) @@ -514,6 +526,7 @@ DEPENDENCIES bootsnap bullet byebug + capybara cbor certified colored2 @@ -598,7 +611,7 @@ DEPENDENCIES rspec-rails rss rswag-specs - rubocop-discourse! + rubocop-discourse ruby-prof ruby-readability rubyzip @@ -606,6 +619,7 @@ DEPENDENCIES sassc (= 2.0.1) sassc-rails seed-fu + selenium-webdriver shoulda-matchers sidekiq simplecov @@ -618,10 +632,11 @@ DEPENDENCIES uglifier unf unicorn + webdrivers webmock webpush xorcist yaml-lint BUNDLED WITH - 2.3.9 + 2.3.22 diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix index 95a0d999a981..632f95c4e1ba 100644 --- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix +++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; annotate = { dependencies = ["activerecord" "rake"]; @@ -273,10 +273,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cwf4pi2i1r1hpz06sishj95aa9m65ymd61sl2vp57ncsrqcyab"; + sha256 = "06rmq3s8q6xndxxl7qid9nf3hiaahs71jyiyyk3bx31hns1vkcci"; type = "gem"; }; - version = "7.0.2"; + version = "7.0.3"; }; byebug = { groups = ["development" "test"]; @@ -292,6 +292,17 @@ }; version = "11.1.3"; }; + capybara = { + dependencies = ["addressable" "matrix" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05df76mfhfab6d7ir0qy5xf1ad6kqdh2p6vfqv7nhlx45k1y4ysg"; + type = "gem"; + }; + version = "3.37.1"; + }; cbor = { groups = ["default"]; platforms = []; @@ -312,6 +323,16 @@ }; version = "1.0.0"; }; + childprocess = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lvcp8bsd35g57f7wz4jigcw2sryzzwrpcgjwwf3chmjrjcww5in"; + type = "gem"; + }; + version = "4.1.0"; + }; chunky_png = { groups = ["default"]; platforms = []; @@ -361,10 +382,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + sha256 = "1nj4r58m5cpfdsijj6gjfs3yzcnxq2halagjk07wjcrgj6z8ayb7"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.0"; }; cose = { dependencies = ["cbor" "openssl-signature_algorithm"]; @@ -414,10 +435,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qbdgp36dhcyljhmfxrvbgp1ha9yqxhxgyg3sdm48y9m371jd2an"; + sha256 = "1107j3frhmcd95wcsz0rypchynnzhnjiyyxxcl6dlmr2lfy08z4b"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; debug_inspector = { groups = ["default" "development"]; @@ -449,16 +470,6 @@ }; version = "3.4.2"; }; - digest = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00vwzvxgby22h7jhwadqqf9ssbkp3ag2pl4g7q3zf1y8mlk7rk39"; - type = "gem"; - }; - version = "3.1.0"; - }; discourse-ember-rails = { dependencies = ["active_model_serializers" "ember-data-source" "ember-handlebars-template" "ember-source" "jquery-rails" "railties"]; groups = ["default"]; @@ -583,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cdc76kgr4f1mq4jwbmq1qvr9c15hb4r1cx4dvrdra13vy9sckb5"; + sha256 = "0qc7l72y7wxlc3pi3paj84jc5jfb0yc1vsc0w6v029il3dd14b8r"; type = "gem"; }; - version = "0.92.4"; + version = "0.92.5"; }; execjs = { groups = ["assets" "default"]; @@ -624,10 +635,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; + sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47"; type = "gem"; }; - version = "2.22.0"; + version = "2.23.0"; }; fakeweb = { groups = ["test"]; @@ -640,116 +651,25 @@ version = "1.3.0"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx"; type = "gem"; }; - version = "1.10.0"; - }; - faraday-em_http = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = ["multipart-post"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; - type = "gem"; - }; - version = "1.0.4"; + version = "2.5.2"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw"; type = "gem"; }; - version = "1.0.1"; - }; - faraday-net_http_persistent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-retry = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; + version = "3.0.0"; }; fast_blank = { groups = ["default"]; @@ -949,10 +869,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033k72f8n28psm89wv1qwsrnqyzz57ihyivyi442wha6vr9iyjz3"; + sha256 = "0nmzpgf5kj7gcjsjxhbhd8p4iw5clj4ljmckx59zndgwz02l7853"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; in_threads = { groups = ["default"]; @@ -1022,10 +942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; + sha256 = "0kcmnx6rgjyd7sznai9ccns2nh7p7wnw3mi8a7vf2wkm51azwddq"; type = "gem"; }; - version = "2.4.1"; + version = "2.5.0"; }; kgio = { groups = ["default"]; @@ -1111,10 +1031,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15kcv5agmash3szsl4aj5ns4daxp439w8czw0fvq4qgf92y4fi8s"; + sha256 = "01n1ynk2xa94za8hhqy3xzfwhm24zhh3x5yllziyz3zjxxrj7fxc"; type = "gem"; }; - version = "2.11.2"; + version = "2.11.3"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -1122,10 +1042,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; + sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; type = "gem"; }; - version = "2.18.0"; + version = "2.19.0"; }; lru_redux = { groups = ["default"]; @@ -1166,6 +1086,16 @@ }; version = "2.8.0.edge"; }; + matrix = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; + }; maxminddb = { groups = ["default"]; platforms = []; @@ -1237,10 +1167,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jf9qjz3r06asz14b6f3z7f2y437a1viqfp52sdi71ipj7dk70bs"; + sha256 = "0i4vbb1549rxbl8a35yaizfkbh28nxby5mcwri5mz3x19yg3p6r8"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; mini_scheduler = { dependencies = ["sidekiq"]; @@ -1279,20 +1209,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.16.2"; + version = "5.16.3"; }; mocha = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffd7zn24lwhp3xp747jfg4zxgqbm04ar7shhjy2iv5xg1pz01lr"; + sha256 = "0z2nzk106b6af6n0d9xqf2sphaff4gpjgxvwqcmvy6k719hqhkh9"; type = "gem"; }; - version = "1.14.0"; + version = "1.15.0"; }; msgpack = { groups = ["default"]; @@ -1303,10 +1233,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; + sha256 = "01sw335w8wl6rjz8raa8xkxnk36d7ib7zqkc9gdibmplar4x1fqg"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; multi_json = { groups = ["default"]; @@ -1328,16 +1258,6 @@ }; version = "0.6.0"; }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; - type = "gem"; - }; - version = "2.2.3"; - }; mustache = { groups = ["default"]; platforms = []; @@ -1360,26 +1280,26 @@ version = "0.2.2"; }; net-imap = { - dependencies = ["digest" "net-protocol" "strscan"]; + dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl79ykmxa2k4dlk6ykrb9l0a4h101q1gd8c4qv3cl0p9h68zmbn"; + sha256 = "0jn5bkvmsfxha6fn19k4sy03jh9mi96aj3wgci42fvxhh69z54kk"; type = "gem"; }; - version = "0.2.3"; + version = "0.3.0"; }; net-pop = { - dependencies = ["digest" "net-protocol" "timeout"]; + dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1slsl3xlbf0cqzmf2q1rfqbm61xvxzmr0h9zprwlbm1xn1cvn9xb"; + sha256 = "1wyz41jd4zpjn0v1xsf9j778qx1vfrl24yc20cpmph8k42c4x2w4"; type = "gem"; }; - version = "0.1.1"; + version = "0.1.2"; }; net-protocol = { dependencies = ["timeout"]; @@ -1393,15 +1313,15 @@ version = "0.1.3"; }; net-smtp = { - dependencies = ["digest" "net-protocol" "timeout"]; + dependencies = ["net-protocol"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s358kfv9mnfxcjbpr1d5a2gs1q7wkw7ffpn86mf1b3s9p31bw9s"; + sha256 = "0d1y3nkgwypfsivip8vzphs3a01a40ds4ng8i314fpr9fdk48dad"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; nio4r = { groups = ["default"]; @@ -1425,14 +1345,26 @@ version = "1.13.8"; }; oauth = { + dependencies = ["oauth-tty" "snaky_hash" "version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1asrxrbgzgzf1r9rb0c785zyyaq9v5z7v3k1avsais2sh9q1y763"; + sha256 = "1syx3hfimaqycy21kn8gmal1cb3bw3hzalv3in2ixnay1xzjp41q"; type = "gem"; }; - version = "0.5.10"; + version = "1.1.0"; + }; + oauth-tty = { + dependencies = ["version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mjmiz82f3p81mipy4skhpbvsv55mcv20qan3m1avdm1ama5fr55"; + type = "gem"; + }; + version = "1.0.3"; }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; @@ -1440,10 +1372,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q6q2kgpxmygk8kmxqn54zkw8cs57a34zzz5cxpsh1bj3ag06rk3"; + sha256 = "042w5lamxhllfxsv0y8v9cvdhmlasy5kxbhcdd3lzj9bhz4gqfb7"; type = "gem"; }; - version = "1.4.7"; + version = "1.4.11"; }; oj = { groups = ["default"]; @@ -1461,10 +1393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz"; + sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; @@ -1516,10 +1448,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10"; + sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; @@ -1537,10 +1469,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1azzx975qr078isvg8i0hmsr2l98kgnlfrnbb2jdm9b5kwifx1h4"; + sha256 = "0n2fhxa2alw3qxhg6qlxs0v6f8rsadhp6r6sv33i9fh793k2zpr3"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; openssl-signature_algorithm = { dependencies = ["openssl"]; @@ -1583,10 +1515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jgqdwfgd4g3mfi854f2n0v615z3n59l24nya7v6cdnaixn5x02y"; + sha256 = "00c71f7hzgs58syyh6b5wwfhlxyhhg9h8sjkqxvxd1i8nlaa3m8x"; type = "gem"; }; - version = "3.11.1"; + version = "3.13.0"; }; parser = { dependencies = ["ast"]; @@ -1625,10 +1557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; + sha256 = "0m445x8fwcjdyv2bc0glzss2nbm1ll51bq45knixapc7cl3dzdlr"; type = "gem"; }; - version = "0.13.1"; + version = "0.14.1"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -1636,10 +1568,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; + sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8"; type = "gem"; }; - version = "3.9.0"; + version = "3.10.1"; }; pry-rails = { dependencies = ["pry"]; @@ -1657,10 +1589,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.0"; }; puma = { dependencies = ["nio4r"]; @@ -1668,10 +1600,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; + sha256 = "0qzq0c791kacv68hgk9zqsd1p7zx1y1rr9j10rn9yphibb8jj436"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.5"; }; r2 = { groups = ["default"]; @@ -1724,10 +1656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; + sha256 = "01wjwmby7kjv8967i2mvvj1h9phdwq2ci7xkk20nbv9xlimypqaz"; type = "gem"; }; - version = "2.2.2"; + version = "3.0.1"; }; rack-test = { dependencies = ["rack"]; @@ -1836,10 +1768,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06c50pvxib7wqnv6q0f3n7gzfcrp5chi3sa48hxpkfxc3hhy11fm"; + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; type = "gem"; }; - version = "0.11.1"; + version = "0.11.2"; }; rb-inotify = { dependencies = ["ffi"]; @@ -1893,20 +1825,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ndj4lcm8rw01078zr0249grsk93zbda8qsibdvlx69b5ijg1rzf"; + sha256 = "04l61lpb3s2xkwj36l7b543lhciv19z514kxnmnbh5fg70grc8q9"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.0"; }; regexp_parser = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rfd3q17p7q7pa67844q8b16ipy6ksh8mkzynpm1zldqbb9x4xm0"; + sha256 = "0mm5sykyblc61a82zz3dag6yy3mvflj2z47060kjzjj5793blqzi"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.0"; }; request_store = { dependencies = ["rack"]; @@ -1998,10 +1930,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001ihayil7jpfxdlxlhakvz02kx0nk5m1w0bz6z8izdx0nc8bh53"; + sha256 = "0l1bzk6a68i1b2qix83vs40r0pbjawv67hixiq2qxsja19bbq3bc"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rspec-html-matchers = { dependencies = ["nokogiri" "rspec"]; @@ -2041,10 +1973,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xfk4pla77251n39zf4n792m1rhg5sn1kp63yvpvvysany34la03"; + sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; type = "gem"; }; - version = "3.11.0"; + version = "3.11.1"; }; rss = { dependencies = ["rexml"]; @@ -2063,10 +1995,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00gm5qbf56shi655hwxzas74avsfv8b91v6i8v06i4jdw8y4qky2"; + sha256 = "1rvjsw01b51ag60zr2pymldzwz6jp7pl0y0lkfq2js1v0cggjdyb"; type = "gem"; }; - version = "2.5.1"; + version = "2.6.0"; }; rubocop = { dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -2074,10 +2006,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n08wns7qaxja8g5fnixicybj1rdq3cjli33l7v1856saizp9lpf"; + sha256 = "1b7zc3gissn5ki7zz2szg1mlxn8zqhgb3bdv96cl25w4mgf4g3in"; type = "gem"; }; - version = "1.34.1"; + version = "1.36.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2095,13 +2027,11 @@ groups = ["development" "test"]; platforms = []; source = { - fetchSubmodules = false; - rev = "a5aea6e5f150b1eb7765a805bec0ff618cb718b3"; - sha256 = "1h25i2ykp1m0j07ij0gq2p632ri01lnykwl3lcishmxncddcz247"; - type = "git"; - url = "https://github.com/discourse/rubocop-discourse.git"; + remotes = ["https://rubygems.org"]; + sha256 = "1afsyw78pkv1ry5x5ww0krv75lg2lnv7b72sy9bbk6ni87fzsk1q"; + type = "gem"; }; - version = "2.5.0"; + version = "3.0"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -2109,10 +2039,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y93hhhcs2j7z8gz8xagwwjs243rskryx4fm62piq9i58lnx4y4j"; + sha256 = "1acfcw78w5mgsj34w5drizl4pzp3ivk67z98k1jxqmja75l7rxxc"; type = "gem"; }; - version = "2.12.1"; + version = "2.13.2"; }; ruby-prof = { groups = ["development"]; @@ -2213,16 +2143,27 @@ }; version = "2.3.9"; }; + selenium-webdriver = { + dependencies = ["childprocess" "rexml" "rubyzip" "websocket"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fp7h5bnlqp649imgpnshgf3mxl8zwnpsl1ak1giii81r0cd6in3"; + type = "gem"; + }; + version = "4.5.0"; + }; shoulda-matchers = { dependencies = ["activesupport"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01svmyma958sbqfz0v29lbqbr0ibvgcng352nhx6bsc9k5c207d0"; + sha256 = "11hv1xk153sspi6iif7a2m64shshpjr37l44c8qnqlfpzv0dxlm2"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; sidekiq = { dependencies = ["connection_pool" "rack" "redis"]; @@ -2230,10 +2171,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zyq0faxkrk9jxqchzjlazpycjh8fg33h84qi654yv9c7a146r2z"; + sha256 = "0p2mj2jj5b9wqmpvkngx87lfr2qgwhqvwx38bmhl5aa29pc6z5kx"; type = "gem"; }; - version = "6.5.4"; + version = "6.5.7"; }; simplecov = { dependencies = ["docile" "simplecov-html" "simplecov_json_formatter"]; @@ -2266,6 +2207,17 @@ }; version = "0.1.4"; }; + snaky_hash = { + dependencies = ["hashie" "version_gem"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pl70rh92wsn15q4lwzikzi7j5a00vm77bqjg07k4sgzx0wjx2zy"; + type = "gem"; + }; + version = "2.0.0"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; groups = ["default"]; @@ -2307,30 +2259,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ih8nb2v4adihb8fihmja72f55dm0ds92j8asadsjm9mpci4bgc"; + sha256 = "1bpmrz2vw59gw556y5hsha3xlrvfv4qwck4wg2r39qf2bp2hcr1b"; type = "gem"; }; - version = "0.2.20"; - }; - strscan = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00ip0m5ad5ywkj4na07qxcyi9wgdh6b877s0ibx5al23abzkxak9"; - type = "gem"; - }; - version = "3.0.4"; + version = "0.2.21"; }; test-prof = { groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xxw3w131mymawr94zkw5y5wgywix53rakfm0bq8s9ccqdx9mm9v"; + sha256 = "1kcmayrkhf0znxpny8f6ca9ljbfv7kdsbig3spy5ylgsv2mjkvzs"; type = "gem"; }; - version = "1.0.9"; + version = "1.0.10"; }; thor = { groups = ["default" "development" "test"]; @@ -2410,10 +2352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; + sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; unicorn = { dependencies = ["kgio" "raindrops"]; @@ -2462,16 +2404,37 @@ }; version = "0.7.0"; }; + version_gem = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "104s7p4zp5yvf0bvbwd9mqmnkgz2z89h4hbvxi8pzd8d08c9a03b"; + type = "gem"; + }; + version = "1.1.0"; + }; + webdrivers = { + dependencies = ["nokogiri" "rubyzip" "selenium-webdriver"]; + groups = ["test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j8kbn592rm11mnyrdq6xp35arfpn9xr0bbkh5imcwpw3wslcfli"; + type = "gem"; + }; + version = "5.1.0"; + }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06jbjl78szxkri3wx0mzsdhx2z2af11kp35k5rsrppchbssgagcj"; + sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; type = "gem"; }; - version = "3.17.1"; + version = "3.18.1"; }; webpush = { dependencies = ["hkdf" "jwt"]; @@ -2484,6 +2447,16 @@ }; version = "1.1.0"; }; + websocket = { + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dib6p55sl606qb4vpwrvj5wh881kk4aqn2zpfapf8ckx7g14jw8"; + type = "gem"; + }; + version = "1.2.9"; + }; xorcist = { groups = ["default"]; platforms = []; @@ -2494,6 +2467,17 @@ }; version = "1.1.3"; }; + xpath = { + dependencies = ["nokogiri"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; + type = "gem"; + }; + version = "3.2.0"; + }; yaml-lint = { groups = ["development"]; platforms = []; diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index 74d74b794760..01eea9c7679b 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -4,6 +4,7 @@ , makeWrapper , nixosTests , openssh +, fetchpatch }: buildGoModule rec { pname = "zrepl"; @@ -16,7 +17,15 @@ buildGoModule rec { sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE="; }; - vendorSha256 = "xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc="; + patches = [ + # fix build with go 1.18 + (fetchpatch { + url = "https://github.com/zrepl/zrepl/commit/19b2deb2cfe5e63b944fa83d12f474b11946ca3f.patch"; + sha256 = "sha256-/SQhU1LnN2n4nwgWF6mq7sW2u52y8mwr6yntakAvSuk="; + }) + ]; + + vendorSha256 = "sha256-xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc="; subPackages = [ "." ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 86c10222f924..65b66b4cf43f 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -11,11 +11,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "222"; + version = "223"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-2TiDHWPwkAXBHnfQ+1h98F+YvqpxcEmmHXt0EWL3MKY="; + sha256 = "sha256-9QyMTYqaxRnVonVedLDGOgeK9/j39//zkzta9ngcNro="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a2328a1f3f91..be8c0cf615af 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -743,7 +743,7 @@ mapAliases ({ mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2022-09-24 murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2022-09-24 mutt-with-sidebar = mutt; # Added 2022-09-17 - mysql-client = throw "'mysql-client' has been renamed to/replaced by 'hiPrio'"; # Converted to throw 2022-09-24 + mysql-client = throw "'mysql-client' has been renamed to/replaced by 'mariadb.client'"; # Converted to throw 2022-09-24 mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2022-09-24 mesa_drivers = throw "'mesa_drivers' has been renamed to/replaced by 'mesa.drivers'"; # Converted to throw 2022-09-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a3f6f52d844..19db0183fb81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7984,6 +7984,8 @@ with pkgs; joplin-desktop = callPackage ../applications/misc/joplin-desktop { }; + jot = callPackage ../applications/misc/jot { }; + journaldriver = callPackage ../tools/misc/journaldriver { openssl = openssl_1_1; }; @@ -37225,10 +37227,7 @@ with pkgs; zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { }; - zrepl = callPackage ../tools/backup/zrepl { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + zrepl = callPackage ../tools/backup/zrepl { }; uhubctl = callPackage ../tools/misc/uhubctl {}; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 564f9d5ecc5c..070e228979cb 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -19421,6 +19421,12 @@ let url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz"; hash = "sha256-CSY85hZugMmNaJ1B0JmVuBM4n9Bpt4RgH23Ff44rQQI="; }; + # ldapi socket location should match the one compiled into the openldap package + postPatch = '' + for f in lib/Net/LDAPI.pm lib/Net/LDAP/Util.pm lib/Net/LDAP.pod lib/Net/LDAP.pm; do + sed -i 's:/var/run/ldapi:/run/openldap/ldapi:g' "$f" + done + ''; buildInputs = [ TextSoundex ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = {