From c586e42763e0f093d16b4b655759cb340171ad42 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 4 Jun 2021 17:28:20 +0200 Subject: [PATCH 01/71] nixos/postgresqlBackup: Use PATH for readability --- nixos/modules/services/backup/postgresql-backup.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 9da2d522a68d..8857335a6e58 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -14,15 +14,17 @@ let requires = [ "postgresql.service" ]; + path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ]; + script = '' umask 0077 # ensure backup is only readable by postgres user if [ -e ${cfg.location}/${db}.sql.gz ]; then - ${pkgs.coreutils}/bin/mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz + mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz fi ${dumpCmd} | \ - ${pkgs.gzip}/bin/gzip -c > ${cfg.location}/${db}.sql.gz + gzip -c > ${cfg.location}/${db}.sql.gz ''; serviceConfig = { @@ -113,12 +115,12 @@ in { }) (mkIf (cfg.enable && cfg.backupAll) { systemd.services.postgresqlBackup = - postgresqlBackupService "all" "${config.services.postgresql.package}/bin/pg_dumpall"; + postgresqlBackupService "all" "pg_dumpall"; }) (mkIf (cfg.enable && !cfg.backupAll) { systemd.services = listToAttrs (map (db: let - cmd = "${config.services.postgresql.package}/bin/pg_dump ${cfg.pgdumpOptions} ${db}"; + cmd = "pg_dump ${cfg.pgdumpOptions} ${db}"; in { name = "postgresqlBackup-${db}"; value = postgresqlBackupService db cmd; From 81c8189a841728a813bcde8604b80427fcf33522 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 4 Jun 2021 17:34:26 +0200 Subject: [PATCH 02/71] nixos/postgresqlBackup: Only replace backup when successful Previously, a failed backup would always overwrite ${db}.sql.gz, because the bash `>` redirect truncates the file; even if the backup was going to fail. On the next run, the ${db}.prev.sql.gz backup would be overwritten by the bad ${db}.sql.gz. Now, if the backup fails, the ${db}.in-progress.sql.gz is in an unknown state, but ${db}.sql.gz will not be written. On the next run, ${db}.prev.sql.gz (our only good backup) will not be overwritten because ${db}.sql.gz does not exist. --- .../services/backup/postgresql-backup.nix | 6 ++++- nixos/tests/postgresql.nix | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 8857335a6e58..f658eb756f7b 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -17,6 +17,8 @@ let path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ]; script = '' + set -e -o pipefail + umask 0077 # ensure backup is only readable by postgres user if [ -e ${cfg.location}/${db}.sql.gz ]; then @@ -24,7 +26,9 @@ let fi ${dumpCmd} | \ - gzip -c > ${cfg.location}/${db}.sql.gz + gzip -c > ${cfg.location}/${db}.in-progress.sql.gz + + mv ${cfg.location}/${db}.in-progress.sql.gz ${cfg.location}/${db}.sql.gz ''; serviceConfig = { diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 091e64294ac5..0369a0707190 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -73,8 +73,30 @@ let machine.succeed( "systemctl start ${backupService}.service", "zcat /var/backup/postgresql/${backupName}.sql.gz | grep 'ok'", + "ls -hal /var/backup/postgresql/ >/dev/console", "stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600", ) + with subtest("Backup service fails gracefully"): + # Sabotage the backup process + machine.succeed("rm /run/postgresql/.s.PGSQL.5432") + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "ls -hal /var/backup/postgresql/ >/dev/console", + "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep 'ok'", + "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz", + ) + # In a previous version, the second run would overwrite prev.sql.gz, + # so we test a second run as well. + machine.fail( + "systemctl start ${backupService}.service", + ) + machine.succeed( + "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz", + "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep 'ok'", + ) + with subtest("Initdb works"): machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2") From be03cf01f30d5319c7f1629a23265655711b9d07 Mon Sep 17 00:00:00 2001 From: roblabla Date: Wed, 23 Jun 2021 15:30:09 +0200 Subject: [PATCH 03/71] linux-kernel: Add dell drivers on 5.12+ --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 26bb9f82063b..355e653c8eae 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -844,6 +844,7 @@ let PREEMPT_VOLUNTARY = yes; X86_AMD_PLATFORM_DEVICE = yes; + X86_PLATFORM_DRIVERS_DELL = whenAtLeast "5.12" yes; } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enable CPU/memory hotplug support From eb7e40f9c9bbf0d9f54d0a65722480abcd28c9d0 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 28 Jun 2021 11:06:44 -0700 Subject: [PATCH 04/71] pipewire: 0.3.30 -> 0.3.31 --- nixos/modules/services/desktops/pipewire/jack.conf.json | 2 +- .../pipewire/0055-pipewire-media-session-path.patch | 7 ++----- .../pipewire/0090-pipewire-config-template-paths.patch | 8 ++++---- pkgs/development/libraries/pipewire/default.nix | 9 +++++++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/desktops/pipewire/jack.conf.json b/nixos/modules/services/desktops/pipewire/jack.conf.json index a6bd34917851..e36e04fffcf2 100644 --- a/nixos/modules/services/desktops/pipewire/jack.conf.json +++ b/nixos/modules/services/desktops/pipewire/jack.conf.json @@ -7,7 +7,7 @@ }, "context.modules": [ { - "name": "libpipewire-module-rtkit", + "name": "libpipewire-module-rt", "args": {}, "flags": [ "ifexists", diff --git a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch index be6683c3e7b7..8290aec5dfc4 100644 --- a/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch +++ b/pkgs/development/libraries/pipewire/0055-pipewire-media-session-path.patch @@ -2,16 +2,13 @@ diff --git a/meson_options.txt b/meson_options.txt index 93b5e2a9..1b915ac3 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -13,6 +13,9 @@ option('media-session', - description: 'Build and install pipewire-media-session', +@@ -200,3 +200,6 @@ option('media-session', type: 'feature', value: 'auto') +option('media-session-prefix', + description: 'Install directory for pipewire-media-session and its support files', + type: 'string') - option('man', - description: 'Build manpages', - type: 'feature', + option('session-managers', diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build index 1edebb2d..251270eb 100644 --- a/src/daemon/systemd/user/meson.build diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index 966cb9579777..1f1a98780e9c 100644 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -6,8 +6,8 @@ index bbafa134..227d3e06 100644 # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ -- # @media_session_path@ -+ # +- # @session_manager_path@ ++ # #] # An array of rejected paths. @@ -15,8 +15,8 @@ index bbafa134..227d3e06 100644 # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @comment@{ path = "@media_session_path@" args = "" } -+ @comment@{ path = "" args = "" } +- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ @comment@{ path = "" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8504d2669849..823ed69f066a 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -14,6 +14,7 @@ , dbus , alsa-lib , libjack2 +, libusb1 , udev , libva , libsndfile @@ -43,10 +44,11 @@ let }; mesonEnable = b: if b then "enabled" else "disabled"; + mesonList = l: "[" + lib.concatStringsSep "," l + "]"; self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.30"; + version = "0.3.31"; outputs = [ "out" @@ -64,7 +66,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-DnaPvZoDaegjtJNKBmCJEAZe5FQBnSER79FPnxiWQUE="; + sha256 = "1dirz69ami7bcgy6hhh0ffi9gzwcy9idg94nvknwvwkjw4zm8m79"; }; patches = [ @@ -96,6 +98,7 @@ let dbus glib libjack2 + libusb1 libsndfile ncurses udev @@ -122,6 +125,7 @@ let "-Dmedia-session-prefix=${placeholder "mediaSession"}" "-Dlibjack-path=${placeholder "jack"}/lib" "-Dlibcamera=disabled" + "-Droc=disabled" "-Dlibpulse=${mesonEnable pulseTunnelSupport}" "-Davahi=${mesonEnable zeroconfSupport}" "-Dgstreamer=${mesonEnable gstreamerSupport}" @@ -133,6 +137,7 @@ let "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}" "-Dsysconfdir=/etc" "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" + "-Dsession-managers=${mesonList (lib.optional withMediaSession "media-session")}" ]; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file From 46c7445c34fbd71118b217593b906e3e9df3caa2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 30 Jun 2021 23:16:37 +0300 Subject: [PATCH 05/71] hplip: hardcode ppdc path to fix #44230 the ppdc: Warning - overlapping filename can be ignored https://bugs.launchpad.net/hplip/+bug/1756967 --- pkgs/misc/drivers/hplip/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 98a67a75f0bc..0decad90ae3c 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -102,6 +102,10 @@ python3Packages.buildPythonApplication { ]; prePatch = '' + # https://github.com/NixOS/nixpkgs/issues/44230 + substituteInPlace createPPD.sh \ + --replace ppdc "${cups}/bin/ppdc" + # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ -e s,/etc/hp,$out/etc/hp,g \ From 962c8311a4a054621d1c276b60ddf2abfcc67189 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 2 Jul 2021 21:05:06 +0800 Subject: [PATCH 06/71] all-cabal-hashes: 2021-06-26T12:56:56Z -> 2021-07-02T10:49:03Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index b44bcc923785..4cd602c620d1 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz", - "sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq", - "msg": "Update from Hackage at 2021-06-26T12:56:56Z" + "commit": "080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/080786cc20b9223cc5c1dc04d3e47ce3ad0b0f36.tar.gz", + "sha256": "0shv10s208nazb7q36vsx6a4sy7a14qikad4b984r9gz3j6g7l62", + "msg": "Update from Hackage at 2021-07-02T10:49:03Z" } From b1cfbd04de65b4b84284ef41b21919da7f42d2e8 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 2 Jul 2021 21:05:50 +0800 Subject: [PATCH 07/71] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1210 +++++++++++++---- 1 file changed, 958 insertions(+), 252 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4e8e61c05b08..736a1b71c959 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8824,8 +8824,8 @@ self: { }: mkDerivation { pname = "HMock"; - version = "0.2.0.0"; - sha256 = "1i5b9fxb5fii3ib97dncr5pfsylj5bsppi45qx7wq1idmz0fq3rj"; + version = "0.3.0.0"; + sha256 = "0rvb3a0nbf8i0qfg7na5rvd966amids07l8w8ka6b7hdw46lkczn"; libraryHaskellDepends = [ base constraints containers data-default exceptions extra monad-control mono-traversable mtl regex-tdfa stm syb @@ -20434,6 +20434,8 @@ self: { pname = "Unixutils"; version = "1.54.2"; sha256 = "040wj8mr2k7spwns3vnadcgynqq4h7zy3lf62lvx7gasjmaj5m4w"; + revision = "1"; + editedCabalFile = "1rhr1isy8vq8ys29p4hcjh889dpfandqm2q5zcxyw4szl068jqc0"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mtl process process-extras pureMD5 regex-tdfa unix zlib @@ -20759,8 +20761,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.6"; - sha256 = "15hmvswhwy7g0i5ybsjby8x4dwyg0j381rh425kjzv9qbjp4dw2r"; + version = "0.6.0.1"; + sha256 = "082i8jhx9s977j8dgn6v92h9nzkblcyw820jk87bg14w4lcgi91v"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21121,12 +21123,12 @@ self: { platforms = lib.platforms.none; }) {}; - "Win32_2_12_0_0" = callPackage + "Win32_2_12_0_1" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.12.0.0"; - sha256 = "068k26s1vxwz94w7bkqs9xbkh0z2mp1mimyklarr8rh26v978qin"; + version = "2.12.0.1"; + sha256 = "1nivdwjp9x9i64xg8gf3xj8khm9dfq6n5m8kvvlhz7i7ypl4mv72"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -21923,8 +21925,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.8.0"; - sha256 = "01x0z7fv0nyyisc9ras79nwbys4g9d13kxwnvgdi8m9p6jvcgy8s"; + version = "0.9.0.0"; + sha256 = "1i5xa299vkvvs4j9mxzyfbw3wgcraihyk9x6wxk0plgj385zl3hr"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -24834,6 +24836,18 @@ self: { broken = true; }) {}; + "aeson-modern-tojson" = callPackage + ({ mkDerivation, aeson, base, inspection-testing }: + mkDerivation { + pname = "aeson-modern-tojson"; + version = "0.1.0.0"; + sha256 = "066yrs4r0ymsf62y1fjaim5l5dddgk7x1ng9m76j36zc8n0xwiqy"; + libraryHaskellDepends = [ aeson base ]; + testHaskellDepends = [ aeson base inspection-testing ]; + description = "Provide a handy way for derving ToJSON proprely"; + license = lib.licenses.isc; + }) {}; + "aeson-native" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder , blaze-textual-native, bytestring, containers, deepseq, hashable @@ -36267,6 +36281,8 @@ self: { pname = "aws-arn"; version = "0.1.0.0"; sha256 = "0wwmrpmcw01wifcpfsb81fx54c49zgg80h2y11cjpr7qkwdhiqwd"; + revision = "1"; + editedCabalFile = "0jcz4wwi46mxymv7d15h5qj2xq8v9b02jqa4ap5r3fa9q6bl9sh3"; libraryHaskellDepends = [ base deriving-compat hashable lens text ]; @@ -36647,8 +36663,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime-wai"; - version = "2.0.1"; - sha256 = "13h0cxmxzr7bgma1ry1yj9dhqzqvh5sgzv6nqyvb0xy8n3gysbcn"; + version = "2.0.2"; + sha256 = "0r309kyc9a38zdldhcdzc7b8h5sjckszzs5y3pygqrbf12xg5n21"; libraryHaskellDepends = [ aeson aws-lambda-haskell-runtime base binary bytestring case-insensitive http-types iproute network text @@ -36953,14 +36969,37 @@ self: { license = lib.licenses.mit; }) {}; + "aws-xray-client_0_1_0_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, async, base, bytestring + , criterion, deepseq, generic-arbitrary, hspec, http-types, lens + , network, QuickCheck, random, text, time + }: + mkDerivation { + pname = "aws-xray-client"; + version = "0.1.0.1"; + sha256 = "1b179i32aw3xi72vnxmgvgczq14ay159cji9mmk345shdiac6crj"; + libraryHaskellDepends = [ + aeson base bytestring deepseq http-types lens network random text + time + ]; + testHaskellDepends = [ + aeson aeson-qq base generic-arbitrary hspec lens QuickCheck random + text + ]; + benchmarkHaskellDepends = [ async base criterion random time ]; + description = "A client for AWS X-Ray"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "aws-xray-client-persistent" = callPackage ({ mkDerivation, aws-xray-client, base, conduit, containers, lens , persistent, random, resourcet, text, time }: mkDerivation { pname = "aws-xray-client-persistent"; - version = "0.1.0.1"; - sha256 = "1b45g9gswr2c16xphprqkrpyh2q29kgnr10hm29zjw5pcahgc8mg"; + version = "0.1.0.2"; + sha256 = "0c2x2bwrddzg1if4fiznmyl62priwr3m626vm0lqndmgjxv13snd"; libraryHaskellDepends = [ aws-xray-client base conduit containers lens persistent random resourcet text time @@ -36986,6 +37025,24 @@ self: { license = lib.licenses.mit; }) {}; + "aws-xray-client-wai_0_1_0_1" = callPackage + ({ mkDerivation, aws-xray-client, base, bytestring, containers + , http-types, lens, random, text, time, unliftio, unliftio-core + , vault, wai + }: + mkDerivation { + pname = "aws-xray-client-wai"; + version = "0.1.0.1"; + sha256 = "0b2rnls3qk7qzn9swfqmslxrw466gs6lhh7zi677k5b0dzh237vp"; + libraryHaskellDepends = [ + aws-xray-client base bytestring containers http-types lens random + text time unliftio unliftio-core vault wai + ]; + description = "A client for AWS X-Ray integration with WAI"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "axel" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , directory, extra, filepath, freer-simple, ghcid, hashable @@ -42346,8 +42403,8 @@ self: { }: mkDerivation { pname = "biscuit-haskell"; - version = "0.1.0.0"; - sha256 = "0h37sl493ribsvqw98xy4g9vii3xc3ap6vvjffn7xg29b62s0lrx"; + version = "0.1.1.0"; + sha256 = "1sq2icbxk6wg4fpsdy0id08qz6nsi175gw0akimppl36b1bmn3sv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42374,6 +42431,26 @@ self: { broken = true; }) {}; + "biscuit-servant" = callPackage + ({ mkDerivation, base, biscuit-haskell, bytestring, hspec + , http-client, mtl, servant, servant-client, servant-client-core + , servant-server, text, wai, warp + }: + mkDerivation { + pname = "biscuit-servant"; + version = "0.1.1.0"; + sha256 = "1rkqmn037d7xc0i5w1rik4d2agb6r77fg3c6207i0pgasbb17zsv"; + libraryHaskellDepends = [ + base biscuit-haskell bytestring mtl servant-server text wai + ]; + testHaskellDepends = [ + base biscuit-haskell bytestring hspec http-client servant + servant-client servant-client-core servant-server text warp + ]; + description = "Servant support for the Biscuit security token"; + license = lib.licenses.bsd3; + }) {}; + "bisect-binary" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hashable , haskeline, integer-logarithms, optparse-applicative, process @@ -42768,23 +42845,21 @@ self: { }) {}; "bitcoin-scripting" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , cereal, containers, haskoin-core, tasty, tasty-hunit - , tasty-quickcheck, text, transformers + ({ mkDerivation, attoparsec, base, bytestring, cereal, containers + , haskoin-core, tasty, tasty-hunit, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "bitcoin-scripting"; - version = "0.1.0"; - sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707"; - revision = "1"; - editedCabalFile = "002i80rqigg3avydg9xhsa8ppyjw6a0r39hbimdghmv8db4wnpbl"; + version = "0.2.0"; + sha256 = "00ml3vnfigymzn8qqzl241q1k0zc4gn9p5zv1339jqv5fz0dvg1b"; libraryHaskellDepends = [ - attoparsec base base16-bytestring bytestring cereal containers - haskoin-core text transformers + attoparsec base bytestring cereal containers haskoin-core text + transformers ]; testHaskellDepends = [ - base base16-bytestring bytestring cereal haskoin-core tasty - tasty-hunit tasty-quickcheck text + base bytestring cereal haskoin-core tasty tasty-hunit + tasty-quickcheck text ]; description = "Resources for working with miniscript, and script descriptors"; license = lib.licenses.bsd3; @@ -59339,6 +59414,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-pandoc_0_2_1_1" = callPackage + ({ mkDerivation, base, commonmark, commonmark-extensions + , pandoc-types, text + }: + mkDerivation { + pname = "commonmark-pandoc"; + version = "0.2.1.1"; + sha256 = "15rfaz49msswb7gh5wyxpm9vckbf3wzyd2m5m2f3hggb82ydk5cp"; + libraryHaskellDepends = [ + base commonmark commonmark-extensions pandoc-types text + ]; + description = "Bridge between commonmark and pandoc AST"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commsec" = callPackage ({ mkDerivation, base, bytestring, cipher-aes128, crypto-api , network @@ -62922,12 +63013,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "containers_0_6_4_1" = callPackage + "containers_0_6_5_1" = callPackage ({ mkDerivation, array, base, deepseq }: mkDerivation { pname = "containers"; - version = "0.6.4.1"; - sha256 = "0vn43a7bf49pih9b65b359xf3658d96dpm9j35i8x8j61vlrcsid"; + version = "0.6.5.1"; + sha256 = "1zlyvkamzc87hr7r3ckyvgwhszdk9i18jrsv2cmkh9v093gvl7ni"; libraryHaskellDepends = [ array base deepseq ]; description = "Assorted concrete container types"; license = lib.licenses.bsd3; @@ -65115,6 +65206,27 @@ self: { ]; }) {}; + "crackNum_3_2" = callPackage + ({ mkDerivation, base, directory, filepath, libBF, process, sbv + , tasty, tasty-golden + }: + mkDerivation { + pname = "crackNum"; + version = "3.2"; + sha256 = "1q9isxg65s9bsafqlcwpl82xypra4cxf935wxi5npbxi6dw5w13i"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath libBF process sbv tasty tasty-golden + ]; + description = "Crack various integer and floating-point data formats"; + license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; + hydraPlatforms = lib.platforms.none; + }) {}; + "craft" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-combinators, conduit-extra @@ -71670,6 +71782,30 @@ self: { broken = true; }) {}; + "dear-imgui" = callPackage + ({ mkDerivation, base, containers, directory, filepath, glew + , inline-c, inline-c-cpp, managed, megaparsec, parser-combinators + , scientific, SDL2, sdl2, StateVar, template-haskell, text, th-lift + , transformers, unliftio, unordered-containers + }: + mkDerivation { + pname = "dear-imgui"; + version = "1.0.1"; + sha256 = "06w88awpcgjdj7d0alikswcqg76gn7pv8njn7dvb4w8dxllypib2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath inline-c inline-c-cpp managed + megaparsec parser-combinators scientific sdl2 StateVar + template-haskell text th-lift transformers unliftio + unordered-containers + ]; + libraryPkgconfigDepends = [ glew SDL2 ]; + doHaddock = false; + description = "Haskell bindings for Dear ImGui"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) SDL2; inherit (pkgs) glew;}; + "debian" = callPackage ({ mkDerivation, base, bytestring, bz2, Cabal, containers , directory, either, exceptions, filepath, hostname, HUnit, lens @@ -74831,6 +74967,8 @@ self: { pname = "diagrams-pgf"; version = "1.4.1.1"; sha256 = "10glg5pqy8zw6l77wnskcawl8da0c10sqfg9dx2jydksd3xpns2f"; + revision = "1"; + editedCabalFile = "00hs5jk49g734majid3sx2wrl9r2flcjn70gqhaiibj6q0hyw206"; libraryHaskellDepends = [ base bytestring bytestring-builder colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels mtl @@ -78225,8 +78363,8 @@ self: { }: mkDerivation { pname = "dockerfile-creator"; - version = "0.1.0.0"; - sha256 = "110qv5v7zh484c3w9zfyinpkpy787nqj161gag8kn50k63w5ff9w"; + version = "0.1.1.0"; + sha256 = "04dd5y0wpznkkvs4izlczizm98l1w6xnqgjynn9lvnh13mwvv1g1"; libraryHaskellDepends = [ base bytestring data-default-class free language-docker megaparsec mtl template-haskell text th-lift th-lift-instances time @@ -83170,8 +83308,8 @@ self: { }: mkDerivation { pname = "elm-syntax"; - version = "0.3.0.0"; - sha256 = "0pv0ly51wpbfr11rng57pasn5sgq7xz986jy36n8qb03q6irvsn9"; + version = "0.3.1.0"; + sha256 = "172xc5nvk2091vbd23ia6dp36d8v2jammb4hvnbk4365y7cgas2l"; libraryHaskellDepends = [ base bound deriving-compat hashable prettyprinter text unordered-containers @@ -83590,6 +83728,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "email-validate_2_3_2_14" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec + , QuickCheck, template-haskell + }: + mkDerivation { + pname = "email-validate"; + version = "2.3.2.14"; + sha256 = "1jl93c5xm20gpngqxgzbcaqhkjl9nxsph17qgzyd2whmkz5yxhk7"; + libraryHaskellDepends = [ + attoparsec base bytestring template-haskell + ]; + testHaskellDepends = [ base bytestring doctest hspec QuickCheck ]; + description = "Email address validation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "email-validate-json" = callPackage ({ mkDerivation, aeson, base, email-validate, text }: mkDerivation { @@ -85034,6 +85189,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "error" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "error"; + version = "0.1.0.0"; + sha256 = "145gxlcqnaxvsrw54xijigfh5ffkh0d6i7r239ysy09ci8ybzfqx"; + libraryHaskellDepends = [ base text ]; + description = "The canonical error type"; + license = lib.licenses.mit; + }) {}; + "error-analyze" = callPackage ({ mkDerivation, base, HUnit, tasty, tasty-hunit, text }: mkDerivation { @@ -87803,8 +87969,8 @@ self: { ({ mkDerivation, base, containers, fgl, mtl, transformers }: mkDerivation { pname = "exploring-interpreters"; - version = "0.3.1.0"; - sha256 = "0765nfr65lphp768j3snzpqpz6f4nrmkvsb6ishflhnxnp99xgyz"; + version = "0.3.2.0"; + sha256 = "0wf35nnqqlvmzn8l3dxrvnr1w9clrzvmpw2vls2zyxnh9dsvrhf7"; libraryHaskellDepends = [ base containers fgl mtl transformers ]; description = "A generic exploring interpreter for exploratory programming"; license = lib.licenses.bsd3; @@ -88704,7 +88870,7 @@ self: { broken = true; }) {}; - "fakedata_1_0" = callPackage + "fakedata_1_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq , directory, exceptions, fakedata-parser, filepath, gauge, hashable , hspec, hspec-discover, QuickCheck, random, regex-tdfa @@ -88713,14 +88879,14 @@ self: { }: mkDerivation { pname = "fakedata"; - version = "1.0"; - sha256 = "1bbb90i6pm8ih1br81hwwz2bb2yvkx6fv44xkw0qv741n9a9rcz0"; + version = "1.0.1"; + sha256 = "08z3qhj93smpd2ksix3i7wcxqkz5533pkx9xf4xjq60qm99scmw6"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base bytestring containers directory exceptions - fakedata-parser filepath hashable QuickCheck random regex-tdfa - string-random template-haskell text time transformers - unordered-containers vector yaml + fakedata-parser filepath hashable random string-random + template-haskell text time transformers unordered-containers vector + yaml ]; testHaskellDepends = [ attoparsec base bytestring containers directory exceptions @@ -88731,9 +88897,9 @@ self: { testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ attoparsec base bytestring containers deepseq directory exceptions - fakedata-parser filepath gauge hashable QuickCheck random - regex-tdfa string-random template-haskell text time transformers - unordered-containers vector yaml + fakedata-parser filepath gauge hashable random string-random + template-haskell text time transformers unordered-containers vector + yaml ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; @@ -94483,6 +94649,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "formatting_7_1_3" = callPackage + ({ mkDerivation, base, clock, criterion, double-conversion + , ghc-prim, hspec, old-locale, QuickCheck, scientific, text, time + , transformers + }: + mkDerivation { + pname = "formatting"; + version = "7.1.3"; + sha256 = "1vrc2i1b6lxx2aq5hysfl3gl6miq2wbhxc384axvgrkqjbibnqc0"; + libraryHaskellDepends = [ + base clock double-conversion ghc-prim old-locale scientific text + time transformers + ]; + testHaskellDepends = [ base ghc-prim hspec scientific text ]; + benchmarkHaskellDepends = [ + base criterion ghc-prim QuickCheck text + ]; + description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "forml" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cereal , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger @@ -94629,8 +94817,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.4.3"; - sha256 = "0wmyx0zlz2hmbrag8wgm8k33z9p0c2ylf3490hf9nz9b2303wflq"; + version = "0.5.0"; + sha256 = "1bza9aav1yy4yzv7lwwi1x466i9h7ar4xvwva1r7992msqp05pxb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94660,8 +94848,8 @@ self: { }: mkDerivation { pname = "fortran-src-extras"; - version = "0.1.0"; - sha256 = "0q4wrif8mx5h6i2wsw2qa1hqdn95ii7211fnk8vj5g9ki3vrnlk8"; + version = "0.2.0"; + sha256 = "0wp1qq7fnzxlar0z7lh4g2fnalwp7xnqg43ws6c9b79xvahk58zi"; libraryHaskellDepends = [ aeson base binary bytestring containers directory filepath fortran-src GenericPretty optparse-applicative text uniplate @@ -97453,8 +97641,8 @@ self: { }: mkDerivation { pname = "futhark-server"; - version = "1.0.0.0"; - sha256 = "00b0qblbx6sg6nk15zasbhbw9i63dmmpcsqdkqvxskr31qzj6vaa"; + version = "1.1.0.0"; + sha256 = "0mv3q4a6l3xp0qjlhh9f8bvgbmrmr4hypnkapb2wsn0fvb0iw2kb"; libraryHaskellDepends = [ base binary bytestring directory futhark-data mtl process temporary text @@ -99114,8 +99302,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "generic-enumeration"; - version = "0.1.0.0"; - sha256 = "1wwhbn3hpanr5ya1dc8spaf1r38sc1hglpz3d6mqizlna0p9a68l"; + version = "0.1.0.1"; + sha256 = "0bznwb8kkifbsd8yi0mp6cym90adjg30fzgj8181nsga4w9vzsab"; libraryHaskellDepends = [ base ]; description = "Generically derived enumerations"; license = lib.licenses.mit; @@ -102170,6 +102358,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-trace-events_0_1_2_3" = callPackage + ({ mkDerivation, base, bytestring, tasty-bench, text }: + mkDerivation { + pname = "ghc-trace-events"; + version = "0.1.2.3"; + sha256 = "11m2ihzlncvxp8x2zgbnzbyybz2lbpdl5flk4gzmq0qz0957j7qd"; + libraryHaskellDepends = [ base bytestring text ]; + benchmarkHaskellDepends = [ base bytestring tasty-bench ]; + description = "Faster traceEvent and traceMarker, and binary object logging for eventlog"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-extra" = callPackage ({ mkDerivation, base, containers, ghc, ghc-prim , ghc-tcplugins-extra, ghc-typelits-knownnat @@ -102578,8 +102779,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "1.4.0.2"; - sha256 = "1xqvfby6yb734lfiyxmzs17zaz56v7fh9rrfz9p81mdgspsqc739"; + version = "1.4.0.3"; + sha256 = "1znf54l3g44cskx5blfaibf1frgyhy5z7906rdvyzb0dqfmkbzpw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104456,8 +104657,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210621"; - sha256 = "01i8mgxz4ca0c50g2w2qgr3m04l5zsw17r0cadn3kwyld662r98n"; + version = "8.20210630"; + sha256 = "0mxzddaf7ra807aazx9gd4rl5565xzky0hwiyby0a06yqnf02266"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -104824,14 +105025,14 @@ self: { }: mkDerivation { pname = "git-repair"; - version = "1.20210111"; - sha256 = "08kdip1pg300yr50xwyklf9xpmcq8pgkym60yz97qj83yhlcszb7"; + version = "1.20210629"; + sha256 = "01k3xwd45ybmfw400zrvfnsnwj1v9xd4hg8iys8h8yk0b2mf2nbj"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ async base bytestring Cabal data-default directory exceptions - filepath filepath-bytestring hslogger IfElse mtl process split unix - unix-compat + filepath filepath-bytestring hslogger IfElse mtl process split time + unix unix-compat ]; executableHaskellDepends = [ async attoparsec base bytestring containers data-default deepseq @@ -109643,8 +109844,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.4.1.3"; - sha256 = "1924d0qymm18zy5pw04irf1nmwdbkbscxcvw4cmjqm9xj7cnyja0"; + version = "0.5.0.0"; + sha256 = "1bykxdqhynyq3xg09f4vv39lypprg0285pi7wpsbjmi5vg8w17pd"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -114603,8 +114804,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.5.0"; - sha256 = "0snh5sp47xqncsb19jp29kc2mjln6gpbhwxmvsqy0z9wgch0ldgb"; + version = "2.6.0"; + sha256 = "0kxj853j4kr9vfp66mc47bd0ylzddbj6in6i7sjlcx4i861n3xnj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124474,6 +124675,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "headroom_0_4_2_0" = callPackage + ({ mkDerivation, aeson, base, doctest, either, extra, file-embed + , generic-data, hspec, hspec-discover, http-client, http-types + , microlens, microlens-th, modern-uri, mtl, mustache + , optparse-applicative, pcre-heavy, pcre-light, QuickCheck, req + , rio, string-interpolate, template-haskell, time, vcs-ignore, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.4.2.0"; + sha256 = "1rg1n3pa6lh1a1flk8g8r5m1s77hl0cyd0c129rw8h1w2w2kkpj0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base either extra file-embed generic-data http-client + http-types microlens microlens-th modern-uri mtl mustache + optparse-applicative pcre-heavy pcre-light req rio + string-interpolate template-haskell time vcs-ignore yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec modern-uri mtl optparse-applicative + pcre-light QuickCheck rio string-interpolate time + ]; + testToolDepends = [ hspec-discover ]; + description = "License Header Manager"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -127867,18 +128098,18 @@ self: { ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base , bytestring, containers, directory, extra, filepath, ghc , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative - , process, sqlite-simple, temporary, text + , process, sqlite-simple, temporary, terminal-size, text }: mkDerivation { pname = "hiedb"; - version = "0.3.0.1"; - sha256 = "1ci68q5r42rarmj12vrmggnj7c7jb8sw3wnmzrq2gn7vqhrr05jc"; + version = "0.4.0.0"; + sha256 = "1frcl9mxmn97qc97l3kw21ksapyndn6jq7yfxxrr0fvzn7jji7wv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs ansi-terminal array base bytestring containers directory extra filepath ghc hie-compat lucid mtl - optparse-applicative sqlite-simple text + optparse-applicative sqlite-simple terminal-size text ]; executableHaskellDepends = [ base ghc-paths ]; testHaskellDepends = [ @@ -144575,6 +144806,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "hyphenation_0_8_2" = callPackage + ({ mkDerivation, base, bytestring, containers, file-embed, text + , unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.8.2"; + sha256 = "05330kd99cg9v6w26sj87wk2nfvpmn2r177kr66vr9n0rlmia60y"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers file-embed text unordered-containers + zlib + ]; + description = "Configurable Knuth-Liang hyphenation"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -144925,8 +145174,8 @@ self: { }: mkDerivation { pname = "ice40-prim"; - version = "0.3.1.0"; - sha256 = "11q09jyckl9q84qv6xxypf5kalxgbrpgq65bqysa26i6xll4p4d0"; + version = "0.3.1.1"; + sha256 = "1g0hfkkzgfkqsyyyhpxz7w4g2v5ay5k7d2xs2dp7m6lpzrgs5dl0"; libraryHaskellDepends = [ base clash-prelude ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise interpolate @@ -152438,14 +152687,20 @@ self: { }) {}; "jsaddle-hello" = callPackage - ({ mkDerivation, base, jsaddle, lens, text }: + ({ mkDerivation, base, Cabal, cabal-macosx, jsaddle, jsaddle-warp + , jsaddle-webkit2gtk, lens, text + }: mkDerivation { pname = "jsaddle-hello"; - version = "2.0.0.0"; - sha256 = "1bn0x8pgafdpf2ddxwinqriqdbdm9j5ca7ka3caqci1qb5sh86ll"; - isLibrary = false; + version = "2.0.0.1"; + sha256 = "08ciwhp1k5ff75z9pq5zyp1vfgzc9aryj4czz3hg57r922yhq5ph"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ base jsaddle lens text ]; + setupHaskellDepends = [ base Cabal cabal-macosx ]; + libraryHaskellDepends = [ base jsaddle lens text ]; + executableHaskellDepends = [ + base jsaddle-warp jsaddle-webkit2gtk lens text + ]; description = "JSaddle Hello World, an example package"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -161413,6 +161668,23 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) leveldb;}; + "levenshtein" = callPackage + ({ mkDerivation, base, binary, deepseq, hashable, hspec + , hspec-discover, QuickCheck + }: + mkDerivation { + pname = "levenshtein"; + version = "0.1.1.0"; + sha256 = "1a4pz175skaw8s02pa6l2jm7m21sfghivzpd2vm2p08lmmwykx5p"; + libraryHaskellDepends = [ + base binary deepseq hashable QuickCheck + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Calculate the edit distance between two foldables"; + license = lib.licenses.bsd3; + }) {}; + "levmar" = callPackage ({ mkDerivation, base, bindings-levmar, hmatrix, vector }: mkDerivation { @@ -161815,8 +162087,8 @@ self: { pname = "libfuse3"; version = "0.1.2.0"; sha256 = "0a59b4xag5vzisrnvf4v1zkdsdzky96h8w2mdj6cip3vgr196frb"; - revision = "2"; - editedCabalFile = "0fbf1zrw5i3jag6yrzxsxcx82dag7a3mw5rmz6ab6v3gm9w8m9b2"; + revision = "3"; + editedCabalFile = "1w59kyc8hvlmbq8n6i7nz8cg8mkzzhfizfpgcm17adxlh6a68ana"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163545,6 +163817,18 @@ self: { broken = true; }) {}; + "linear-smc" = callPackage + ({ mkDerivation, array, base, constraints }: + mkDerivation { + pname = "linear-smc"; + version = "1.0.0"; + sha256 = "13b1gvpnpxvkswigd9cdq289m6d68vqddnq95p0i65vr2hhard8i"; + libraryHaskellDepends = [ base constraints ]; + testHaskellDepends = [ array base constraints ]; + description = "Build SMC morphisms using linear types"; + license = lib.licenses.lgpl3Plus; + }) {}; + "linear-socket" = callPackage ({ mkDerivation, base, bytestring, hspec, network, tasty-hspec }: mkDerivation { @@ -164244,16 +164528,16 @@ self: { }) {}; "lion" = callPackage - ({ mkDerivation, base, Cabal, clash-prelude, generic-monoid + ({ mkDerivation, base, clash-prelude, generic-monoid , ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, ice40-prim, lens, mtl }: mkDerivation { pname = "lion"; - version = "0.2.0.0"; - sha256 = "0i0sr8jiaigpfhy4wnvblnrx5bl7l1vbh0pzjpdzks6r3g07h58f"; + version = "0.3.0.0"; + sha256 = "0yz5p4wvdl518nqc0vjjrmvl5danm9hp37gnar8ancf2nrfh9gr9"; libraryHaskellDepends = [ - base Cabal clash-prelude generic-monoid ghc-typelits-extra + base clash-prelude generic-monoid ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise ice40-prim lens mtl ]; description = "RISC-V Core"; @@ -164301,14 +164585,18 @@ self: { }) {}; "liquid-base" = callPackage - ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: + ({ mkDerivation, base, Cabal, integer-gmp, liquid-ghc-prim + , liquidhaskell + }: mkDerivation { pname = "liquid-base"; - version = "4.14.1.0"; - sha256 = "0w5pwksyf8fbr8v8j5mshcysxlbz4lxdvmayc3pj8cm8xcdrvzkm"; + version = "4.15.0.0"; + sha256 = "1f1lqdd65a3z0by0i3dr51hahcsq8s3vcc0xyxlvb5pp3vsz89vm"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; - libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; + libraryHaskellDepends = [ + base integer-gmp liquid-ghc-prim liquidhaskell + ]; description = "Drop-in base replacement for LiquidHaskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -164384,8 +164672,8 @@ self: { ({ mkDerivation, base, Cabal, ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-ghc-prim"; - version = "0.6.1"; - sha256 = "1zpb0izg4y98xz87ivn6rs5nfshvawrxyb5hc8jzif2p17j0aqpb"; + version = "0.7.0"; + sha256 = "0pyhdg0fcvg0hm6m541hkr9spl3mghf9s4nkl62vi0hfwp1gd5bb"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ ghc-prim liquidhaskell ]; @@ -164889,17 +165177,17 @@ self: { "list-zipper" = callPackage ({ mkDerivation, base, checkers, comonad, deriving-compat, hedgehog - , hedgehog-fn, lens, mtl, QuickCheck, semigroupoids, semigroups - , tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , transformers + , hedgehog-fn, lens, MonadRandom, mtl, QuickCheck, random-shuffle + , semigroupoids, semigroups, tasty, tasty-hedgehog, tasty-hunit + , tasty-quickcheck, transformers }: mkDerivation { pname = "list-zipper"; - version = "0.0.10"; - sha256 = "0vnylv1w7lkvlh7kmaz06gbq7fiz6dm44rl2s9r2nrnfslm4bjr3"; + version = "0.0.11"; + sha256 = "0p68plalb2cj8bmhwkkfd5vjcrxbmbbi7flwlhrf10j2fyl6qs1h"; libraryHaskellDepends = [ - base comonad deriving-compat lens mtl semigroupoids semigroups - transformers + base comonad deriving-compat lens MonadRandom mtl random-shuffle + semigroupoids semigroups transformers ]; testHaskellDepends = [ base checkers hedgehog hedgehog-fn lens mtl QuickCheck tasty @@ -168039,8 +168327,8 @@ self: { }: mkDerivation { pname = "lumberjack"; - version = "1.0.0.0"; - sha256 = "1avv2qsncq10dfx3kqvd7q9dzwk1wmf39a61zw2cr8a8jpg89mfi"; + version = "1.0.0.1"; + sha256 = "0m0xyy42d2ibmnyhixf5hs65a2b1fhbjzx5j3430wcvzb4h71fdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184186,6 +184474,40 @@ self: { license = lib.licenses.bsd3; }) {}; + "net-mqtt_0_8_0_0" = callPackage + ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary + , bytestring, checkers, conduit, conduit-extra, connection + , containers, deepseq, HUnit, network-conduit-tls, network-uri + , optparse-applicative, QuickCheck, stm, tasty, tasty-hunit + , tasty-quickcheck, text, websockets + }: + mkDerivation { + pname = "net-mqtt"; + version = "0.8.0.0"; + sha256 = "1635kk5619syjj80ynpnd61qdiaxm349qyzhbaa8nc8nm8kkw2gh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra connection containers deepseq network-conduit-tls + network-uri QuickCheck stm text websockets + ]; + executableHaskellDepends = [ + async attoparsec attoparsec-binary base binary bytestring conduit + conduit-extra connection containers deepseq network-conduit-tls + network-uri optparse-applicative QuickCheck stm text websockets + ]; + testHaskellDepends = [ + async attoparsec attoparsec-binary base binary bytestring checkers + conduit conduit-extra connection containers deepseq HUnit + network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit + tasty-quickcheck text websockets + ]; + description = "An MQTT Protocol Implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "net-mqtt-lens" = callPackage ({ mkDerivation, base, HUnit, lens, net-mqtt, tasty, tasty-hunit , tasty-quickcheck @@ -184202,14 +184524,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "net-mqtt-lens_0_1_1_0" = callPackage + ({ mkDerivation, base, HUnit, lens, net-mqtt, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "net-mqtt-lens"; + version = "0.1.1.0"; + sha256 = "0rlib45yqlcij12pij8y690n3ajma35fyj8292b1vggk07dscycq"; + libraryHaskellDepends = [ base lens net-mqtt ]; + testHaskellDepends = [ + base HUnit lens net-mqtt tasty tasty-hunit tasty-quickcheck + ]; + description = "Optics for net-mqtt"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "net-mqtt-rpc" = callPackage ({ mkDerivation, base, bytestring, exceptions, net-mqtt , network-uri, optparse-applicative, random, stm, text, uuid }: mkDerivation { pname = "net-mqtt-rpc"; - version = "0.1.2.1"; - sha256 = "01qkix666jh7yvm0gl195brjbi8yw06nnp86iksahvch2bnsz9ax"; + version = "0.2.0.0"; + sha256 = "1ql1hjvx41gspjbpr4rldrcn0xj483g2cphvxbb51m4x6n690lkn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -187978,10 +188317,8 @@ self: { }: mkDerivation { pname = "nothunks"; - version = "0.1.2"; - sha256 = "0z9calmdw4bk4cdwrfq5nkxxks2f82q59i7kv6lnsgwyl4nqvg2y"; - revision = "1"; - editedCabalFile = "18q60yrm0fwb7zs4saxv4f3gk2av4dmbjag04kxzrllfy34h3y6z"; + version = "0.1.3"; + sha256 = "0lqfhnyxhmhajvsgmz5h428pb5zrdy9zvbc5inzhd83cv31yk4f1"; libraryHaskellDepends = [ base bytestring containers ghc-heap stm text time vector ]; @@ -188297,25 +188634,27 @@ self: { license = lib.licenses.bsd3; }) {}; - "nri-observability_0_1_1_0" = callPackage + "nri-observability_0_1_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs - , bytestring, directory, hostname, http-client, http-client-tls - , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text - , time, unordered-containers, uuid + , bytestring, conduit, directory, hostname, http-client + , http-client-tls, nri-env-parser, nri-prelude, random + , safe-exceptions, stm, text, time, unordered-containers, uuid }: mkDerivation { pname = "nri-observability"; - version = "0.1.1.0"; - sha256 = "17zr60z6i07cnqs6x2r3lzd5hk0g8sh10hyckh84ynyjpdzksggd"; + version = "0.1.1.1"; + sha256 = "15vlk59jl8wsxw48r72hdxnhhgk4p5xx598nbzp3ap88iqhm35d5"; libraryHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers uuid + aeson aeson-pretty async base bugsnag-hs bytestring conduit + directory hostname http-client http-client-tls nri-env-parser + nri-prelude random safe-exceptions stm text time + unordered-containers uuid ]; testHaskellDepends = [ - aeson aeson-pretty async base bugsnag-hs bytestring directory - hostname http-client http-client-tls nri-env-parser nri-prelude - random safe-exceptions stm text time unordered-containers uuid + aeson aeson-pretty async base bugsnag-hs bytestring conduit + directory hostname http-client http-client-tls nri-env-parser + nri-prelude random safe-exceptions stm text time + unordered-containers uuid ]; description = "Report log spans collected by nri-prelude"; license = lib.licenses.bsd3; @@ -190732,7 +191071,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "opaleye_0_7_2_0" = callPackage + "opaleye_0_7_3_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, dotenv, hspec , hspec-discover, multiset, postgresql-simple, pretty @@ -190742,8 +191081,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.7.2.0"; - sha256 = "1qz34isgb5hl2ab5vij3zw1h3xwvl3a0d1k02n156xszibnkcgf1"; + version = "0.7.3.0"; + sha256 = "0ls8hk8iy47hna1y7kbakzv9ihp61lv605f1ap4di95fv03wy288"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -195235,6 +195574,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_2_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.2.3"; + sha256 = "17r9fgs83dp0s9wq14q5hvf5vnl8d7cg9p9dnbixgsysq6g6d29g"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -196678,14 +197059,27 @@ self: { }) {}; "parsley" = callPackage - ({ mkDerivation, base, parsley-core, template-haskell, text }: + ({ mkDerivation, array, attoparsec, base, bytestring, containers + , criterion, deepseq, happy, megaparsec, mtl, parsec, parsley-core + , parsley-garnish, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, th-test-utils + }: mkDerivation { pname = "parsley"; - version = "1.0.0.0"; - sha256 = "08g89wgynvr58xypcpvd552v7h16cb1rbfggiyr8dj49bmgm0hwx"; + version = "1.0.0.1"; + sha256 = "0z4w6hwa0yj34xsqp63kqy3wkk51k343fv8ijbk0s4w4hdx7d7jb"; libraryHaskellDepends = [ base parsley-core template-haskell text ]; + testHaskellDepends = [ + base deepseq parsley-garnish tasty tasty-hunit tasty-quickcheck + template-haskell th-test-utils + ]; + benchmarkHaskellDepends = [ + array attoparsec base bytestring containers criterion deepseq + megaparsec mtl parsec parsley-garnish template-haskell text + ]; + benchmarkToolDepends = [ happy ]; description = "A fast parser combinator library backed by Typed Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -196699,8 +197093,8 @@ self: { }: mkDerivation { pname = "parsley-core"; - version = "1.0.0.0"; - sha256 = "0vcvxnmnml5jsjicx6rhskkb30ggz95wjlfcj1fzxc9si9vlkh4j"; + version = "1.2.0.0"; + sha256 = "0q3kj5ima8i06rmm5659jhhzfm6shgb3k4sbf34dq1jbwgqrkja1"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text @@ -198053,6 +198447,30 @@ self: { license = lib.licenses.asl20; }) {}; + "pcre2_2_0_0" = callPackage + ({ mkDerivation, base, containers, criterion, hspec + , microlens-platform, mtl, pcre-light, regex-pcre-builtin + , template-haskell, text + }: + mkDerivation { + pname = "pcre2"; + version = "2.0.0"; + sha256 = "1jkyc2s3x5n7zrw9b78gk8jj262xfmg8cva2gr7mlzzl0hd9r11y"; + libraryHaskellDepends = [ + base containers mtl template-haskell text + ]; + testHaskellDepends = [ + base containers hspec microlens-platform mtl template-haskell text + ]; + benchmarkHaskellDepends = [ + base containers criterion microlens-platform mtl pcre-light + regex-pcre-builtin template-haskell text + ]; + description = "Regular expressions via the PCRE2 C library (included)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "pdf-slave" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, directory, exceptions, haskintex, HaTeX @@ -199297,7 +199715,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_13_0_4" = callPackage + "persistent_2_13_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -199308,8 +199726,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.0.4"; - sha256 = "04q4x50p2jpsp7fzrb61rs225hnrl8n1khmdvf0z6inkwq462w6a"; + version = "2.13.1.1"; + sha256 = "0sg51psmpjsz9hiva0gn3xcnd74a6dwbzx1bzi918idcfkpbn496"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -199404,8 +199822,8 @@ self: { }: mkDerivation { pname = "persistent-discover"; - version = "0.1.0.1"; - sha256 = "1vncymwn132x3mf468r94r6wa6890zgmvjhq64gr5bhzh3mnah6c"; + version = "0.1.0.4"; + sha256 = "0p5nfxs885siy0a629iwqxksz3704zyinfhl55n74crxad3kgacj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -199433,10 +199851,8 @@ self: { }: mkDerivation { pname = "persistent-documentation"; - version = "0.1.0.2"; - sha256 = "0ys864vjzl97c9qv0gg5q9zviammrfvm0schvh7ckr9pdg062z17"; - revision = "1"; - editedCabalFile = "0pzgmwqjyzpql7d6bk9xkzkjvm21giq7f420y4fqq4wli3g2cwmx"; + version = "0.1.0.3"; + sha256 = "03p3ppjrn9j76bwgq7n921c2h0xkzsf9ish6nx6bhxdggyq3bfwy"; libraryHaskellDepends = [ base containers mtl persistent template-haskell text ]; @@ -200358,6 +200774,32 @@ self: { broken = true; }) {}; + "pg-transact_0_3_2_0" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, deepseq + , exceptions, hspec, hspec-expectations-lifted, monad-control + , postgresql-libpq, postgresql-simple, tmp-postgres, transformers + }: + mkDerivation { + pname = "pg-transact"; + version = "0.3.2.0"; + sha256 = "0ch44w9hdvylpcnz1d89v75m4y0rjv1h572bcmcx2n77zs19w45g"; + libraryHaskellDepends = [ + base bytestring exceptions monad-control postgresql-simple + transformers + ]; + testHaskellDepends = [ + async base bytestring exceptions hspec hspec-expectations-lifted + postgresql-libpq postgresql-simple tmp-postgres + ]; + benchmarkHaskellDepends = [ + base criterion deepseq postgresql-simple tmp-postgres + ]; + description = "A postgresql-simple transaction monad"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "pgdl" = callPackage ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit , conduit-extra, configurator, containers, directory @@ -204876,8 +205318,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.1.2.2"; - sha256 = "15vi5x099r38jk3lnynpi8my4fp06fkzwvrxgpvxdfp9ilg2al6h"; + version = "0.1.2.3"; + sha256 = "0awsnl207i1fi7qv4cqhfa22r2diq7js6s06xgwgxbzd0wmq2j9g"; libraryHaskellDepends = [ aeson base chronos containers polysemy polysemy-plugin polysemy-time relude text @@ -204886,7 +205328,7 @@ self: { aeson base chronos containers hedgehog polysemy polysemy-plugin polysemy-test polysemy-time relude tasty tasty-hedgehog text ]; - description = "Polysemy effect for chronos"; + description = "Polysemy-time Interpreters for Chronos"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -205199,14 +205641,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-req" = callPackage + ({ mkDerivation, base, polysemy, req }: + mkDerivation { + pname = "polysemy-req"; + version = "0.1.0"; + sha256 = "1vji169hk7an0dal8chk3h3jb6yxjh037arp15zkc8y5m0r5wbnm"; + libraryHaskellDepends = [ base polysemy req ]; + description = "Polysemy effect for req"; + license = lib.licenses.bsd3; + }) {}; + "polysemy-resume" = callPackage ({ mkDerivation, base, hedgehog, polysemy, polysemy-plugin , polysemy-test, relude, tasty, tasty-hedgehog, text, transformers }: mkDerivation { pname = "polysemy-resume"; - version = "0.1.0.2"; - sha256 = "0s6ayc1qlpvpasysf9z5jcy3gfqc9agg76xxlahpjn1ysaswbgmq"; + version = "0.1.0.3"; + sha256 = "02nlhkhzjr5zg8q4ff0an1vxm5vxwkq1d83j4980xkq20582sfvl"; libraryHaskellDepends = [ base polysemy relude transformers ]; testHaskellDepends = [ base hedgehog polysemy polysemy-plugin polysemy-test relude tasty @@ -205224,8 +205677,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.3.1.3"; - sha256 = "0m6zczyw4shgrpfyz23m9n3626mxcfqj0sdfcrnlkz7n0k0k0470"; + version = "0.3.1.4"; + sha256 = "0cysny71f92d4ncx0mjglc3wjc7yna2x6113rq8kk4s5z0zsqj7z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers either hedgehog path path-io polysemy @@ -205250,8 +205703,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.1.2.2"; - sha256 = "1q08dwyp4v28s31gfq2ha8irfhczxzhg9c96wps6iz5xl7cir9va"; + version = "0.1.2.3"; + sha256 = "0hxh9i3rw434igzx41nzbgglnvgvvgrxbgwz7cb25srj4911n69j"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor @@ -205261,7 +205714,7 @@ self: { polysemy polysemy-plugin polysemy-test relude string-interpolate tasty tasty-hedgehog template-haskell text time torsor ]; - description = "Polysemy effect for time"; + description = "Polysemy Effect for Time"; license = "BSD-2-Clause-Patent"; hydraPlatforms = lib.platforms.none; }) {}; @@ -206359,32 +206812,32 @@ self: { }) {}; "postgres-websockets" = callPackage - ({ mkDerivation, aeson, alarmclock, async, auto-update, base - , base64-bytestring, bytestring, contravariant, either, envparse - , hasql, hasql-notifications, hasql-pool, hspec, hspec-wai - , hspec-wai-json, http-types, jose, lens, lens-aeson, network - , postgresql-libpq, protolude, retry, stm, stm-containers - , stringsearch, text, time, unordered-containers, wai - , wai-app-static, wai-extra, wai-websockets, warp, websockets + ({ mkDerivation, aeson, alarmclock, auto-update, base + , base64-bytestring, bytestring, either, envparse, hasql + , hasql-notifications, hasql-pool, hspec, http-types, jose, lens + , lens-aeson, network, postgresql-libpq, protolude, retry, stm + , stm-containers, text, time, unordered-containers, wai + , wai-app-static, wai-extra, wai-websockets, warp, warp-tls + , websockets }: mkDerivation { pname = "postgres-websockets"; - version = "0.10.0.0"; - sha256 = "1rhpv9dams24iy9wpj0v69blr2109xprz7yj1y0ng9cw3bnsrldm"; + version = "0.11.1.0"; + sha256 = "1q7pgklgc0d93hwacv3akx1vi29hvanj7lpyl29nzzwwk2y2pird"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson alarmclock async auto-update base base64-bytestring - bytestring contravariant either envparse hasql hasql-notifications - hasql-pool http-types jose lens postgresql-libpq protolude retry - stm stm-containers stringsearch text time unordered-containers wai - wai-app-static wai-extra wai-websockets warp websockets + aeson alarmclock auto-update base base64-bytestring bytestring + either envparse hasql hasql-notifications hasql-pool http-types + jose lens postgresql-libpq protolude retry stm stm-containers text + time unordered-containers wai wai-app-static wai-extra + wai-websockets warp warp-tls websockets ]; executableHaskellDepends = [ base protolude ]; testHaskellDepends = [ - aeson base hasql hasql-notifications hasql-pool hspec hspec-wai - hspec-wai-json http-types lens lens-aeson network protolude stm - time unordered-containers wai-extra websockets + aeson base hasql hasql-notifications hasql-pool hspec http-types + lens lens-aeson network protolude stm time unordered-containers + wai-extra websockets ]; description = "Middleware to map LISTEN/NOTIFY messages to Websockets"; license = lib.licenses.bsd3; @@ -206708,6 +207161,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "postgresql-replicant" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bits + , bytestring, cereal, containers, hspec, keep-alive + , postgresql-libpq, scientific, stm, text, time + }: + mkDerivation { + pname = "postgresql-replicant"; + version = "0.1.0.1"; + sha256 = "1jlmbi5inwwpwyvrfg13b91fv642xcahfv8nhi0y6dqrvfj69h0q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bits bytestring cereal containers + keep-alive postgresql-libpq scientific stm text time + ]; + executableHaskellDepends = [ base postgresql-libpq ]; + testHaskellDepends = [ base binary bytestring cereal hspec ]; + description = "PostgreSQL logical streaming replication library"; + license = lib.licenses.bsd3; + }) {}; + "postgresql-schema" = callPackage ({ mkDerivation, base, basic-prelude, optparse-applicative , postgresql-simple, shelly, text, time @@ -209080,6 +209554,29 @@ self: { license = lib.licenses.mit; }) {}; + "primitive-extras_0_10_1_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus + , foldl, list-t, primitive, primitive-unlifted, profunctors + , QuickCheck, quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "primitive-extras"; + version = "0.10.1.1"; + sha256 = "117bgh5bafzvamkpl4g97c8vprs4lndl5pjc3nl6wqj7jbrgpw25"; + libraryHaskellDepends = [ + base bytestring cereal deferred-folds focus foldl list-t primitive + primitive-unlifted profunctors vector + ]; + testHaskellDepends = [ + cereal deferred-folds focus primitive QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + description = "Extras for the \"primitive\" library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-foreign" = callPackage ({ mkDerivation, base, primitive, QuickCheck }: mkDerivation { @@ -209554,16 +210051,14 @@ self: { license = lib.licenses.mit; }) {}; - "process_1_6_11_0" = callPackage + "process_1_6_12_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.11.0"; - sha256 = "0nv8c2hnx1l6xls6b61l8sm7j250qfbj1fjj5n6m15ppk9f0d9jd"; - revision = "2"; - editedCabalFile = "1yz98g78syad217c816q5rrdb7w93lpsp3pcc4djsy050w9ji56n"; + version = "1.6.12.0"; + sha256 = "1zw551zrnq70ip9dsc564aw1zf90l48jf59rxhjgx4d00ngs165x"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -212600,8 +213095,8 @@ self: { }: mkDerivation { pname = "push-notify-apn"; - version = "0.2.0.1"; - sha256 = "1p33nwazxk4kk52vw6i8rrsgy8i3bzn0klp56bv6nj1751z3mzbj"; + version = "0.2.0.2"; + sha256 = "194xn4wrnpdcyc76b9qplyfv15qgrqb60x41j43lwskh8yvr57sx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218090,21 +218585,21 @@ self: { "recover-rtti" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, ghc-heap - , ghc-prim, mtl, QuickCheck, sop-core, stm, tasty, tasty-quickcheck - , text, unordered-containers, vector + , ghc-prim, mtl, primitive, QuickCheck, sop-core, stm, tasty + , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "recover-rtti"; - version = "0.3.0.0"; - sha256 = "0zk08jzsww8sv3q9h1mnc6a8ckqlf3lvc5cxwfbni7rb9giz6zia"; + version = "0.4.0.0"; + sha256 = "15nyshkbl7yh9h19ia3hgyciq2mn11nvsp258pb3f8d8xjjyk820"; libraryHaskellDepends = [ - aeson base bytestring containers ghc-heap mtl sop-core stm text - unordered-containers vector + aeson base bytestring containers ghc-heap mtl primitive sop-core + stm text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers ghc-heap ghc-prim mtl QuickCheck - sop-core stm tasty tasty-quickcheck text unordered-containers - vector + aeson base bytestring containers ghc-heap ghc-prim mtl primitive + QuickCheck sop-core stm tasty tasty-quickcheck text + unordered-containers vector ]; description = "Recover run-time type information from the GHC heap"; license = lib.licenses.bsd3; @@ -220727,6 +221222,8 @@ self: { pname = "rel8"; version = "1.0.0.1"; sha256 = "1kwvib3chqw5xrz6v7z0jy75mgyhqqb755xzn02zz2hvjwfcqc6v"; + revision = "1"; + editedCabalFile = "04lq11nxq5n6l6hlgqi78xbfknvx7s5mycwzcp2a0p99kcn3x9a4"; libraryHaskellDepends = [ aeson base bytestring case-insensitive contravariant hasql opaleye profunctors scientific semialign semigroupoids text these time @@ -222353,8 +222850,8 @@ self: { pname = "resolv"; version = "0.1.2.0"; sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; - revision = "2"; - editedCabalFile = "0nn5dalsl9sradkpv4awsb90v8cvcqvw4hd58yvpp4vpfybnk90h"; + revision = "3"; + editedCabalFile = "0af5dsdyn04i76d012xhhfkkml10bqzl6q2yivkhf8rlvh1fiii5"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -232352,15 +232849,15 @@ self: { }) {}; "servant-checked-exceptions" = callPackage - ({ mkDerivation, base, bytestring, hspec-wai, http-types, servant - , servant-checked-exceptions-core, servant-client + ({ mkDerivation, base, bytestring, hspec, hspec-wai, http-types + , servant, servant-checked-exceptions-core, servant-client , servant-client-core, servant-server, tasty, tasty-hspec , tasty-hunit, wai, world-peace }: mkDerivation { pname = "servant-checked-exceptions"; - version = "2.2.0.0"; - sha256 = "1shbnrjk2d0lq9nskl95jkfgr4ad79nx4k87zjg4c4m6m09nf5bh"; + version = "2.2.0.1"; + sha256 = "0md5ck09phkplf0kqzj79sac92s8pw1pmic3bxcwcda80h26ck2j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232368,8 +232865,8 @@ self: { servant-client servant-client-core servant-server wai world-peace ]; testHaskellDepends = [ - base hspec-wai http-types servant servant-server tasty tasty-hspec - tasty-hunit wai + base hspec hspec-wai http-types servant servant-server tasty + tasty-hspec tasty-hunit wai ]; description = "Checked exceptions for Servant APIs"; license = lib.licenses.bsd3; @@ -232382,8 +232879,8 @@ self: { }: mkDerivation { pname = "servant-checked-exceptions-core"; - version = "2.2.0.0"; - sha256 = "1irakwsdj6f0yjp0cpgai6x01yq99qd2rwy1w3pb7xwiksdnxx6c"; + version = "2.2.0.1"; + sha256 = "023fb1a15wjx6bwfix072sprckzkn2kzdkwbh6dr2yh4rg5snvrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233603,8 +234100,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.2"; sha256 = "1lqvycbv49x0i3adbsdlcl49n65wxfjzhiz9pj11hg4k0j952q5p"; - revision = "1"; - editedCabalFile = "19mag4xbiswaxpdxjn5yj3jbascbwza0y89zppgzb342prqdryjr"; + revision = "2"; + editedCabalFile = "0cb41wx0lgssda2v26cn36c32j2g0q6gsif7jyy3c5fhaqmn3svv"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -234478,6 +234975,8 @@ self: { pname = "servant-swagger-ui"; version = "0.3.5.3.47.1"; sha256 = "00bmkj87rnd9zmg54h3z8k9zgs5d17lcdn9gp006xixa6g494cms"; + revision = "1"; + editedCabalFile = "1dn93dhr8qaxr3raz5myrps1bkhlr6bha8q3kwhyj4q7ahdvj4nj"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -234495,6 +234994,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.5"; sha256 = "0ckvrwrb3x39hfl2hixcj3fhibh0vqsh6y7n1lsm25yvzfrg02zd"; + revision = "1"; + editedCabalFile = "0fk7bj8fndxf1aw8xhhacjp8rrvx10gj7kh9d2pvjavnz310ymxg"; libraryHaskellDepends = [ aeson base blaze-markup bytestring http-media servant servant-blaze servant-server text transformers transformers-compat wai-app-static @@ -234511,6 +235012,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.4"; sha256 = "04s4syfmnjwa52xqm29x2sfi1ka6p7fpjff0pxry099rh0d59hkm"; + revision = "1"; + editedCabalFile = "0yvgbyqdkjp5qv88gm7wgcl5rb4haijc4jfmmfcq8g63ya7msx9x"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -234527,6 +235030,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.4.1.22.3"; sha256 = "0ln2sz7ffhddk4dqvczpxb5g8f6bic7sandn5zifpz2jg7lgzy0f"; + revision = "1"; + editedCabalFile = "1w6h6g8hlsyv87xxxyrsjz5gdkphmxgc4y63g8mmv4hgdncrb1jk"; libraryHaskellDepends = [ aeson base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core text @@ -235523,6 +236028,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "sexp-grammar_2_3_1" = 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.1"; + sha256 = "05vj998wzj1wja4848kd04c89jb8pmvdyl40aw6qvc9fq0qzw6m4"; + libraryHaskellDepends = [ + array base bytestring containers data-fix deepseq + invertible-grammar prettyprinter recursion-schemes scientific + semigroups text utf8-string + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base containers invertible-grammar prettyprinter QuickCheck + scientific semigroups tasty tasty-hunit tasty-quickcheck text + utf8-string + ]; + 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 { @@ -236948,10 +237483,8 @@ self: { }: mkDerivation { pname = "shh"; - version = "0.7.1.0"; - sha256 = "03b8h6sjnrlksvpr9f451469j5xngqpb6g3hyxmxp7h7h4xrsvq2"; - revision = "1"; - editedCabalFile = "1sv4rxkwvsb1j42k6bhbvig8215xzmgmqaxacljq03aqqv3x3jf2"; + version = "0.7.1.4"; + sha256 = "1yriini033kja8w9hrxyfbc62nbwg4fb5nl8rj004gdkbaiz7wbl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -237948,6 +238481,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "simple-cmd-args_0_1_7" = callPackage + ({ mkDerivation, base, optparse-applicative }: + mkDerivation { + pname = "simple-cmd-args"; + version = "0.1.7"; + sha256 = "0lf0pyiv02sg2yh9avj92fm75sni61qnaq3rmjw5vlczy03ksxpc"; + libraryHaskellDepends = [ base optparse-applicative ]; + description = "Simple command args parsing and execution"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "simple-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, CC-delcont , chunked-data, conduit, conduit-combinators, conduit-extra @@ -238491,8 +239036,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.9.6"; - sha256 = "1smr9lbr46nghbyk39j5v2s53zw1k2v1sbwwzj5js5h61xj33zs9"; + version = "0.9.7"; + sha256 = "17arwga9irr5aacf0mrdnp1lw1vqlfl3kzwaaiwcw39idlprdnb4"; libraryHaskellDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = lib.licenses.bsd3; @@ -245509,6 +246054,8 @@ self: { pname = "sr-extra"; version = "1.85.1"; sha256 = "15x8d413m8ldl81b5yx13nprr4k0aszx33mjm880za0k90s8r65x"; + revision = "1"; + editedCabalFile = "0pmf6vlxv8kd6imq9xwnfc8j3mk6yswvcirdmb2hi8ql41cqwnay"; libraryHaskellDepends = [ base base64-bytestring bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data @@ -246018,18 +246565,20 @@ self: { }) {}; "stack-all" = callPackage - ({ mkDerivation, base, config-ini, directory, extra, filepath - , process, simple-cmd, simple-cmd-args, text + ({ mkDerivation, aeson, base, bytestring, config-ini, directory + , extra, filepath, http-query, process, simple-cmd, simple-cmd-args + , text, time, unordered-containers, xdg-basedir }: mkDerivation { pname = "stack-all"; - version = "0.2.2"; - sha256 = "0bk22ryqvyc4r058yj3ngq33wv24m7r1alnbvg4c0h08fmwxi4m0"; + version = "0.3"; + sha256 = "0bxrchryn0r02bbkxwwyi9rlkknjqwbiypbfj47q9fzyb2rv9gk1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base config-ini directory extra filepath process simple-cmd - simple-cmd-args text + aeson base bytestring config-ini directory extra filepath + http-query process simple-cmd simple-cmd-args text time + unordered-containers xdg-basedir ]; description = "CLI tool for building across Stackage major versions"; license = lib.licenses.bsd3; @@ -249500,6 +250049,27 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; + "streamly_0_8_0" = callPackage + ({ mkDerivation, atomic-primops, base, containers, deepseq + , directory, exceptions, fusion-plugin-types, ghc-prim, heaps + , lockfree-queue, monad-control, mtl, network, primitive + , transformers, transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.8.0"; + sha256 = "1ng1zfayk21z03rr3m1kwhrj0if4yl3nggp971r25rks9rb01il5"; + libraryHaskellDepends = [ + atomic-primops base containers deepseq directory exceptions + fusion-plugin-types ghc-prim heaps lockfree-queue monad-control mtl + network primitive transformers transformers-base + ]; + description = "Dataflow programming and declarative concurrency"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "streamly-archive" = callPackage ({ mkDerivation, archive, base, bytestring, cryptonite, directory , filepath, QuickCheck, streamly, tar, tasty, tasty-hunit @@ -249585,6 +250155,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "streamly-examples" = callPackage + ({ mkDerivation, base, containers, directory, exceptions, hashable + , mtl, network, random, streamly, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "streamly-examples"; + version = "0.1.0"; + sha256 = "0ny22z33wwkg9bbziwcj77k6gb8lwj1v0y5z6mw8sw20k4ca93q3"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory exceptions hashable mtl network random + streamly transformers transformers-base unordered-containers vector + ]; + description = "Examples for Streamly"; + license = lib.licenses.asl20; + }) {}; + "streamly-fsnotify" = callPackage ({ mkDerivation, base, filepath, fsnotify, semirings, streamly , text, time @@ -249593,8 +250182,8 @@ self: { pname = "streamly-fsnotify"; version = "1.1.1.0"; sha256 = "1xcw4rsrysh96d91wjmyzb5s7cls3rf0ilpv8dn525iqzv11fl3l"; - revision = "1"; - editedCabalFile = "0lcpps69dk4xr4wd1z5zpykvsfqrd0jlqx87rqbzjndgrw9xh685"; + revision = "2"; + editedCabalFile = "0axnmnqcgcs5j805clm1mqyhvfil019n8r8530sjgjbp7m34wrkh"; libraryHaskellDepends = [ base filepath fsnotify semirings streamly text time ]; @@ -250446,6 +251035,18 @@ self: { license = lib.licenses.mit; }) {}; + "stripe-concepts_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "stripe-concepts"; + version = "1.0.3"; + sha256 = "1wykg9flg0qliqlz3ywkmnqhh55aa61r4mvbhsly6ib8r6knr382"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Stripe API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers @@ -251136,8 +251737,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "subG"; - version = "0.4.2.0"; - sha256 = "17fzdwlmh8ykwqn9h9a60wpnvqbgbz0wk6cgcrglbj0i41jy28jv"; + version = "0.5.2.0"; + sha256 = "0s2fzzrw3fqr02lqifm1qfily5gnvrlsswpnj7hvnv0bsgql9b23"; libraryHaskellDepends = [ base ]; description = "Some extension to the Foldable and Monoid classes"; license = lib.licenses.mit; @@ -252520,8 +253121,8 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.3.0.1"; - sha256 = "1y30qx18ps412r28grlxpfxw3ikirbf3kkxmqwd75ydxp9apn52k"; + version = "1.3.0.2"; + sha256 = "0p8fzkd4wqvmc5fjlsb0ri6645n1rg304m8nm9085ipy1svi7sn0"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -253088,27 +253689,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest-yesod_0_2_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , conduit, containers, cookie, exceptions, http-client, http-types - , monad-logger, mtl, network, persistent, persistent-sqlite + "sydtest-yesod_0_3_0_0" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring + , case-insensitive, conduit, containers, cookie, exceptions + , http-client, http-client-tls, http-types, monad-logger, mtl + , network, network-uri, persistent, persistent-sqlite , persistent-template, pretty-show, QuickCheck, resourcet, sydtest , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test }: mkDerivation { pname = "sydtest-yesod"; - version = "0.2.0.1"; - sha256 = "1h2gqwp968n1gyg9r7x82c6kdnnfs7m341j7w7wbx3rcvd57c2jf"; + version = "0.3.0.0"; + sha256 = "19pc9yxfw355xvp27i0g1xdlwg8hck8p4y7mnvxrwvwnp911akkf"; libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive containers cookie - exceptions http-client http-types mtl network pretty-show sydtest - sydtest-wai text time wai xml-conduit yesod-core yesod-test + base binary blaze-builder bytestring case-insensitive containers + cookie exceptions http-client http-client-tls http-types mtl + network network-uri pretty-show sydtest sydtest-wai text time wai + xml-conduit yesod-core yesod-test ]; testHaskellDepends = [ base bytestring conduit cookie http-client http-types monad-logger mtl persistent persistent-sqlite persistent-template QuickCheck - resourcet sydtest sydtest-persistent-sqlite text yesod yesod-form + resourcet sydtest sydtest-persistent-sqlite text yesod yesod-core + yesod-form ]; testToolDepends = [ sydtest-discover ]; description = "A yesod companion library for sydtest"; @@ -256033,8 +256637,8 @@ self: { }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.0.0"; - sha256 = "1ahy4nmkbqpfw38ny6w85q5whsidk3xyy8m6v6ndik2i8jjh8qr4"; + version = "1.0.1.0"; + sha256 = "0nj4xjnlrd3righ0d0yv4py7wjls51khjyacpgjs3s5knaxyippp"; libraryHaskellDepends = [ base exceptions parameterized-utils text ]; @@ -258571,27 +259175,27 @@ self: { "tesla" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, casing - , containers, cryptonite, exceptions, generic-deriving, HUnit, lens - , lens-aeson, memory, monad-logger, mtl, random, retry, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text - , time, unliftio-core, vector, wreq + , containers, cryptonite, exceptions, generic-deriving, http-client + , HUnit, lens, lens-aeson, memory, monad-logger, mtl, random, retry + , tagsoup, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, unliftio-core, vector, wreq }: mkDerivation { pname = "tesla"; - version = "0.4.1.0"; - sha256 = "0rnzgcwkgwnpjlf2r47a28zwkbnsb75wfmdiwnq4w99i2f519dnd"; + version = "0.4.1.3"; + sha256 = "1g4kl1lnbx37ffqir3w20j5aifl3196cnb28366c77jmp9dmwxna"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring casing containers - cryptonite exceptions generic-deriving lens lens-aeson memory - monad-logger mtl random retry tagsoup template-haskell text time - unliftio-core vector wreq + cryptonite exceptions generic-deriving http-client lens lens-aeson + memory monad-logger mtl random retry tagsoup template-haskell text + time unliftio-core vector wreq ]; testHaskellDepends = [ aeson base base64-bytestring bytestring casing containers - cryptonite exceptions generic-deriving HUnit lens lens-aeson memory - monad-logger mtl random retry tagsoup tasty tasty-hunit - tasty-quickcheck template-haskell text time unliftio-core vector - wreq + cryptonite exceptions generic-deriving http-client HUnit lens + lens-aeson memory monad-logger mtl random retry tagsoup tasty + tasty-hunit tasty-quickcheck template-haskell text time + unliftio-core vector wreq ]; description = "Tesla API client"; license = lib.licenses.bsd3; @@ -265111,8 +265715,8 @@ self: { }: mkDerivation { pname = "tracing"; - version = "0.0.7.0"; - sha256 = "0mm2s367n7zggnbgcvhffjin47pfyzr76ywg60vhfjcb1zzmkv4l"; + version = "0.0.7.2"; + sha256 = "06cqj4801inww5lw5c1qbjp5yrbg5rpifnkr9w5lws8654v44iim"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive containers http-client mtl network random stm text time transformers unliftio @@ -266598,8 +267202,8 @@ self: { pname = "trie-simple"; version = "0.4.1.1"; sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7"; - revision = "2"; - editedCabalFile = "1v3aiqn3c91md7y0wqcdvafy1fwjr8hfsg17ykqr1si8ax6hy5j0"; + revision = "3"; + editedCabalFile = "02h7dw73879gvy0jrxd7a4rzfhi2fcr5jivqc4ck97w67w2pg8zm"; libraryHaskellDepends = [ base containers deepseq mtl ]; testHaskellDepends = [ base containers hspec QuickCheck vector ]; benchmarkHaskellDepends = [ @@ -274907,6 +275511,18 @@ self: { broken = true; }) {}; + "variadic-function" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "variadic-function"; + version = "0.1.0.1"; + sha256 = "0p458anbqlx23x77wp1nh465za3dad5s0gjrkdhi364rr4v58i3a"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Create and transform functions with variable arity"; + license = lib.licenses.bsd3; + }) {}; + "variation" = callPackage ({ mkDerivation, base, cereal, containers, deepseq, semigroupoids }: @@ -275723,6 +276339,25 @@ self: { maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; + "vector-sized_1_4_4" = callPackage + ({ mkDerivation, adjunctions, base, binary, comonad, deepseq + , distributive, finite-typelits, hashable, indexed-list-literals + , primitive, vector + }: + mkDerivation { + pname = "vector-sized"; + version = "1.4.4"; + sha256 = "0rlzwxcxzrxg7nwqijigj80fr4fyi5c2a8785898kir5hcyd6v1d"; + libraryHaskellDepends = [ + adjunctions base binary comonad deepseq distributive + finite-typelits hashable indexed-list-literals primitive vector + ]; + description = "Size tagged vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ expipiplus1 ]; + }) {}; + "vector-space" = callPackage ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { @@ -277275,13 +277910,20 @@ self: { }) {}; "vulkan" = callPackage - ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: + ({ mkDerivation, base, bytestring, containers, inline-c, tasty + , tasty-discover, tasty-hunit, template-haskell, transformers + , vector, vulkan + }: mkDerivation { pname = "vulkan"; - version = "3.11"; - sha256 = "0kpnchaidl555zr5k166kmxnb8kiablnwjhi2gb665v64shj3k2k"; + version = "3.11.1"; + sha256 = "18ci35csymc788hr2md5cfxmra3ad0rc5mrbk37jjf0qga9a375x"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; + testHaskellDepends = [ + base containers inline-c tasty tasty-hunit template-haskell + ]; + testToolDepends = [ tasty-discover ]; description = "Bindings to the Vulkan graphics API"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "x86_64-linux" ]; @@ -277843,8 +278485,8 @@ self: { pname = "wai-handler-hal"; version = "0.1.0.0"; sha256 = "0sjw01k5dyhdi33ld1pd4mf9plpij0spzxf2b228cjyc8x5zx7rj"; - revision = "1"; - editedCabalFile = "0gnl0xfsx1ahm0w0xykdzm96h3riz497wz9gxdmvzv0aflcg6jw9"; + revision = "2"; + editedCabalFile = "0aj45x1czwd69hd4yxsc607njb1qwxz926izzh79axfkrzgiij9k"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -283102,16 +283744,16 @@ self: { "wreq-helper" = callPackage ({ mkDerivation, aeson, aeson-result, base, bytestring, http-client - , lens, text, wreq + , text }: mkDerivation { pname = "wreq-helper"; - version = "0.1.0.0"; - sha256 = "18kmh3swa3bbrkfj1dldi7iy6brdvyhfrbdn8gsz2kcarvhnv5f2"; + version = "0.2.0.0"; + sha256 = "181qsfcbkzzri9w1r7wx4a0aq6ahkp3b6nhiras6hg3bcql4wq28"; libraryHaskellDepends = [ - aeson aeson-result base bytestring http-client lens text wreq + aeson aeson-result base bytestring http-client text ]; - description = "Wreq response process"; + description = "HTTP/HTTPS response process"; license = lib.licenses.bsd3; }) {}; @@ -287174,20 +287816,18 @@ self: { "yarn-lock" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, either - , megaparsec, neat-interpolation, protolude, quickcheck-instances - , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text + , megaparsec, neat-interpolation, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, text }: mkDerivation { pname = "yarn-lock"; - version = "0.6.4"; - sha256 = "0vab0k1z2b8j18d5bqiraa4zpxr9rqg2s52y28j3qk292lmpmni9"; - libraryHaskellDepends = [ - base containers either megaparsec protolude text - ]; + version = "0.6.5"; + sha256 = "1x4zhczp6qgzm3sgmc2j5mjffg1ibfpvkxfwh2dv5bcx9nzv7bxy"; + libraryHaskellDepends = [ base containers either megaparsec text ]; testHaskellDepends = [ ansi-wl-pprint base containers either megaparsec neat-interpolation - protolude quickcheck-instances tasty tasty-hunit tasty-quickcheck - tasty-th text + quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th + text ]; description = "Represent and parse yarn.lock files"; license = lib.licenses.mit; @@ -287616,6 +288256,28 @@ self: { license = lib.licenses.mit; }) {}; + "yesod_1_6_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit + , data-default-class, directory, fast-logger, file-embed + , monad-logger, shakespeare, streaming-commons, template-haskell + , text, unix, unordered-containers, wai, wai-extra, wai-logger + , warp, yaml, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.6.1.2"; + sha256 = "13r0ispprj41kgn2rkc7zhy1rxfmgpjbmdlnys15h0ihhh3zhw2f"; + libraryHaskellDepends = [ + aeson base bytestring conduit data-default-class directory + fast-logger file-embed monad-logger shakespeare streaming-commons + template-haskell text unix unordered-containers wai wai-extra + wai-logger warp yaml yesod-core yesod-form yesod-persistent + ]; + description = "Creation of type-safe, RESTful web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-alerts" = callPackage ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text , yesod-core @@ -288207,6 +288869,8 @@ self: { pname = "yesod-comments"; version = "0.9.2"; sha256 = "1isw8cwzwwsm7p3hqj0ynwncsdfg7x0ihphyv02awchqbgc2c87i"; + revision = "1"; + editedCabalFile = "1p1ilvvqyh20mg89cfacjqawwahbx7nk5yg5n9l2i8mqwdfijbdj"; libraryHaskellDepends = [ base bytestring directory friendly-time gravatar old-locale persistent template-haskell text time wai yesod yesod-auth @@ -288297,6 +288961,44 @@ self: { license = lib.licenses.mit; }) {}; + "yesod-core_1_6_20_2" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, entropy + , fast-logger, gauge, hspec, hspec-expectations, http-types, HUnit + , memory, monad-logger, mtl, network, parsec, path-pieces + , primitive, random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.20.2"; + sha256 = "184j6nslwrfxw4zmsxlii6gs1z0h350kgmbnr5y3wwk3n4dsdzyb"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq entropy fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -288708,6 +289410,8 @@ self: { pname = "yesod-goodies"; version = "0.0.5"; sha256 = "0wxdwyb5dg00ycb09kbl1m12w2bzi6kxbjr4dqgrwfd3dgypcjdz"; + revision = "1"; + editedCabalFile = "1b6aw2xqq50i7zqgshllbna890m53ksq4l49l6rm1r0gw06ydnd0"; libraryHaskellDepends = [ base blaze-html bytestring directory HTTP old-locale pandoc pureMD5 text time yesod yesod-form @@ -288795,6 +289499,8 @@ self: { pname = "yesod-links"; version = "0.3.0"; sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y"; + revision = "1"; + editedCabalFile = "0pnzl4j9pwljjgnfwv8hwhcdf222nm43jsdbxrixi2lbvi2w9hjc"; libraryHaskellDepends = [ base text yesod-core ]; description = "A typeclass which simplifies creating link widgets throughout your site"; license = lib.licenses.bsd3; From 83e723aa17b41b9cfbb546044dd13e410e69656d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 3 Jul 2021 00:36:01 +0200 Subject: [PATCH 08/71] haskellPackages.git-annex: update hash for 8.20210630 --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b6e5274be003..4e22f86a0093 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,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 = "1hf2i36ayscdg7fa81akx031chg8c3scbjphj4c1qawif41bynmm"; + sha256 = "0nvaaba06dgkl2kfq6ldmj0v6mm2dh7wfky6lsxxy5kskbncyqjr"; # 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 From f4336e488464ce0c8f32925f5e9d29d1799937f5 Mon Sep 17 00:00:00 2001 From: Kenny MacDermid Date: Sat, 3 Jul 2021 19:10:23 -0300 Subject: [PATCH 09/71] weechat-matrix: 0.2.0 -> 0.3.0 --- .../networking/irc/weechat/scripts/weechat-matrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index c82fb9ca7395..a900a469e031 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -21,7 +21,7 @@ let python_magic ]); - version = "0.2.0"; + version = "0.3.0"; in buildPythonPackage { pname = "weechat-matrix"; inherit version; @@ -30,7 +30,7 @@ in buildPythonPackage { owner = "poljar"; repo = "weechat-matrix"; rev = version; - hash = "sha256-qsTdF9mGHac4rPs53mgoOElcujicRNXbJ7GsoptWSGc="; + hash = "sha256-o4kgneszVLENG167nWnk2FxM+PsMzi+PSyMUMIktZcc="; }; propagatedBuildInputs = [ From 542b4497e92e1ba700f60294f00dc0e1b96d09c9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 4 Jul 2021 21:36:49 +0200 Subject: [PATCH 10/71] top-level/release-haskell.nix: use integer-simple GHC for static CI This should avoid any licensing problems wrt GMP being LGPL. --- pkgs/top-level/release-haskell.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 87a08dddb606..c4db73d416c9 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -82,7 +82,7 @@ let recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; staticHaskellPackagesPlatforms = - packagePlatforms pkgs.pkgsStatic.haskellPackages; + packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104; jobs = recursiveUpdateMany [ (mapTestOn { @@ -98,7 +98,8 @@ let # test some statically linked packages to catch regressions # and get some cache going for static compilation with GHC - pkgsStatic.haskellPackages = { + # Use integer-simple to avoid GMP linking problems (LGPL) + pkgsStatic.haskell.packages.integer-simple.ghc8104 = { inherit (staticHaskellPackagesPlatforms) hello random @@ -300,12 +301,12 @@ let }; constituents = [ # TODO: reenable darwin builds if static libiconv works - jobs.pkgsStatic.haskellPackages.hello.x86_64-linux - jobs.pkgsStatic.haskellPackages.hello.aarch64-linux - jobs.pkgsStatic.haskellPackages.lens.x86_64-linux - jobs.pkgsStatic.haskellPackages.lens.aarch64-linux - jobs.pkgsStatic.haskellPackages.random.x86_64-linux - jobs.pkgsStatic.haskellPackages.random.aarch64-linux + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.x86_64-linux + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello.aarch64-linux + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.x86_64-linux + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens.aarch64-linux + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.x86_64-linux + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random.aarch64-linux ]; }; } From ef532a04436001249a7c24e13c628e970791dc7f Mon Sep 17 00:00:00 2001 From: arcnmx Date: Mon, 28 Jun 2021 11:07:38 -0700 Subject: [PATCH 11/71] nixos/pipewire: add bluez hardware database --- .../pipewire/bluez-hardware.conf.json | 197 ++++++++++++++++++ .../pipewire/pipewire-media-session.nix | 6 + .../libraries/pipewire/default.nix | 1 + 3 files changed, 204 insertions(+) create mode 100644 nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json diff --git a/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json new file mode 100644 index 000000000000..7c527b292158 --- /dev/null +++ b/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -0,0 +1,197 @@ +{ + "bluez5.features.device": [ + { + "name": "Air 1 Plus", + "no-features": [ + "hw-volume-mic" + ] + }, + { + "name": "AirPods", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "AirPods Pro", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "AXLOIE Goin", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "JBL Endurance RUN BT", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl", + "sbc-xq" + ] + }, + { + "name": "JBL LIVE650BTNC" + }, + { + "name": "Soundcore Life P2-L", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "name": "Urbanista Stockholm Plus", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "address": "~^94:16:25:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^9c:64:8b:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^a0:e9:db:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^0c:a6:94:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:14:02:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^44:5e:f3:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^d4:9c:28:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:18:6b:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^b8:ad:3e:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^a0:e9:db:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:24:1c:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:11:b1:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^a4:15:66:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:14:f1:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^00:26:7e:", + "no-features": [ + "hw-volume" + ] + }, + { + "address": "~^90:03:b7:", + "no-features": [ + "hw-volume" + ] + } + ], + "bluez5.features.adapter": [ + { + "bus-type": "usb", + "vendor-id": "usb:0bda" + }, + { + "bus-type": "usb", + "no-features": [ + "msbc-alt1-rtl" + ] + }, + { + "no-features": [ + "msbc-alt1-rtl" + ] + } + ], + "bluez5.features.kernel": [ + { + "sysname": "Linux", + "release": "~^[0-4]\\.", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "sysname": "Linux", + "release": "~^5\\.[1-7]\\.", + "no-features": [ + "msbc-alt1", + "msbc-alt1-rtl" + ] + }, + { + "sysname": "Linux", + "release": "~^5\\.(8|9|10)\\.", + "no-features": [ + "msbc-alt1" + ] + }, + { + "no-features": [] + } + ] +} diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix index 17a2d49bb1f3..41ab995e3292 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix @@ -15,6 +15,7 @@ let defaults = { alsa-monitor = (builtins.fromJSON (builtins.readFile ./alsa-monitor.conf.json)); bluez-monitor = (builtins.fromJSON (builtins.readFile ./bluez-monitor.conf.json)); + bluez-hardware = (builtins.fromJSON (builtins.readFile ./bluez-hardware.conf.json)); media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json)); v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json)); }; @@ -22,6 +23,7 @@ let configs = { alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor; bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor; + bluez-hardware = defaults.bluez-hardware; media-session = recursiveUpdate defaults.media-session cfg.config.media-session; v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor; }; @@ -120,6 +122,10 @@ in { mkIf config.services.pipewire.pulse.enable { source = json.generate "bluez-monitor.conf" configs.bluez-monitor; }; + environment.etc."pipewire/media-session.d/bluez-hardware.conf" = + mkIf config.services.pipewire.pulse.enable { + source = json.generate "bluez-hardware.conf" configs.bluez-hardware; + }; environment.etc."pipewire/media-session.d/with-jack" = mkIf config.services.pipewire.jack.enable { diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 823ed69f066a..5f32216737ef 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -192,6 +192,7 @@ let paths-out-media-session = [ "nix-support/etc/pipewire/media-session.d/alsa-monitor.conf.json" "nix-support/etc/pipewire/media-session.d/bluez-monitor.conf.json" + "nix-support/etc/pipewire/media-session.d/bluez-hardware.conf.json" "nix-support/etc/pipewire/media-session.d/media-session.conf.json" "nix-support/etc/pipewire/media-session.d/v4l2-monitor.conf.json" ]; From 2c529c3cb8770d2dccf1c4c4428515cfba306f13 Mon Sep 17 00:00:00 2001 From: slotThe Date: Sat, 19 Jun 2021 18:23:15 +0200 Subject: [PATCH 12/71] Link to Libera, Matrix instead of Freenode The project has moved away from Freenode as an IRC network[1], and there is now a quite large channel on Libera. As such, we should point users towards that instead. This also changes all examples to refer to libera instead of freenode as, with the recent deletion of all freenode channels, it is perhaps where most communities are to be found nowadays. Finally, also link to the official Matrix room[2] as an alternative to IRC. Related: https://github.com/NixOS/nixpkgs/pull/129384 [1]: https://discourse.nixos.org/t/join-us-on-matrix-at-nix-nixos-org-migrating-from-freenode [2]: https://github.com/NixOS/rfcs/pull/94 --- .github/STALE-BOT.md | 2 +- doc/builders/packages/weechat.section.md | 2 +- nixos/doc/manual/preface.xml | 11 ++++++----- nixos/modules/services/networking/matterbridge.nix | 6 +++--- nixos/modules/services/networking/znc/default.nix | 4 ++-- nixos/modules/services/networking/znc/options.nix | 6 +++--- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/STALE-BOT.md b/.github/STALE-BOT.md index 7b3f013710a8..0c5a21cc3524 100644 --- a/.github/STALE-BOT.md +++ b/.github/STALE-BOT.md @@ -3,7 +3,7 @@ - Thanks for your contribution! - To remove the stale label, just leave a new comment. - _How to find the right people to ping?_ → [`git blame`](https://git-scm.com/docs/git-blame) to the rescue! (or GitHub's history and blame buttons.) -- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/) or on the [#nixos IRC channel](https://webchat.freenode.net/#nixos). +- You can always ask for help on [our Discourse Forum](https://discourse.nixos.org/), [our Matrix room](https://matrix.to/#/#nix:nixos.org), or on the [#nixos IRC channel](https://web.libera.chat/#nixos). ## Suggestions for PRs diff --git a/doc/builders/packages/weechat.section.md b/doc/builders/packages/weechat.section.md index 1d99b00e6323..e4e956b908ed 100644 --- a/doc/builders/packages/weechat.section.md +++ b/doc/builders/packages/weechat.section.md @@ -41,7 +41,7 @@ weechat.override { configure = { availablePlugins, ... }: { init = '' /set foo bar - /server add freenode chat.freenode.org + /server add libera irc.libera.chat ''; }; } diff --git a/nixos/doc/manual/preface.xml b/nixos/doc/manual/preface.xml index ded6bdc87deb..c0d530c3d1b5 100644 --- a/nixos/doc/manual/preface.xml +++ b/nixos/doc/manual/preface.xml @@ -18,12 +18,13 @@ If you encounter problems, please report them on the Discourse or - on the Discourse, + the Matrix room, + or on the - #nixos channel on Libera.Chat, or - consider - #nixos channel on Libera.Chat. + Alternatively, consider contributing to this manual. Bugs should be reported in diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix index b8b4f37c84a8..9186eee26abf 100644 --- a/nixos/modules/services/networking/matterbridge.nix +++ b/nixos/modules/services/networking/matterbridge.nix @@ -38,8 +38,8 @@ in # Use services.matterbridge.configPath instead. [irc] - [irc.freenode] - Server="irc.freenode.net:6667" + [irc.libera] + Server="irc.libera.chat:6667" Nick="matterbot" [mattermost] @@ -55,7 +55,7 @@ in name="gateway1" enable=true [[gateway.inout]] - account="irc.freenode" + account="irc.libera" channel="#testing" [[gateway.inout]] diff --git a/nixos/modules/services/networking/znc/default.nix b/nixos/modules/services/networking/znc/default.nix index aa79ed27dcef..b872b99976ce 100644 --- a/nixos/modules/services/networking/znc/default.nix +++ b/nixos/modules/services/networking/znc/default.nix @@ -133,8 +133,8 @@ in Nick = "paul"; AltNick = "paul1"; LoadModule = [ "chansaver" "controlpanel" ]; - Network.freenode = { - Server = "chat.freenode.net +6697"; + Network.libera = { + Server = "irc.libera.chat +6697"; LoadModule = [ "simple_away" ]; Chan = { "#nixos" = { Detached = false; }; diff --git a/nixos/modules/services/networking/znc/options.nix b/nixos/modules/services/networking/znc/options.nix index 7a43b45fabba..be9dc78c86d9 100644 --- a/nixos/modules/services/networking/znc/options.nix +++ b/nixos/modules/services/networking/znc/options.nix @@ -11,7 +11,7 @@ let server = mkOption { type = types.str; - example = "chat.freenode.net"; + example = "irc.libera.chat"; description = '' IRC server address. ''; @@ -150,8 +150,8 @@ in ''; example = literalExample '' { - "freenode" = { - server = "chat.freenode.net"; + "libera" = { + server = "irc.libera.chat"; port = 6697; useSSL = true; modules = [ "simple_away" ]; From ff57c9b2a5cf34958c6f2bdf82a68889e8525ed4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 6 Jul 2021 16:06:36 +0000 Subject: [PATCH 13/71] juju: 2.8.7 -> 2.9.5 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index b4de49730fe8..a91255f54e34 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.8.7"; + version = "2.9.5"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-ZiG+LMeQboFxaLIBSHjRNe5tt8bEguYXQp3nhkoMpek="; + sha256 = "sha256-oBwusx63a8AWNHqlNtG0S/SiIRM55fbc/CGN2MFJDYA="; }; - vendorSha256 = "sha256-5R3TmwOzHgdEQhS4B4Bb0InghaEhUVxDSl7oZl3aNZ4="; + vendorSha256 = "sha256-VHUDqDsfY0c6r5sJbMX7JcXTIBXze9cd5qHqZWZAC2g="; # Disable tests because it attempts to use a mongodb instance doCheck = false; From 8a13e377fd72aa02b54e9f949151c2a85fe0a3a4 Mon Sep 17 00:00:00 2001 From: Peter Woodman Date: Tue, 6 Jul 2021 20:18:33 -0400 Subject: [PATCH 14/71] kubectx: 0.9.3 -> 0.9.4 --- pkgs/development/tools/kubectx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index f9d109f33879..8ddd7685dcfb 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectx"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-anTogloat0YJN6LR6mww5IPwokHYoDY6L7i2pMzI8/M="; + sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM="; }; vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg="; From 655dc5b67eadad07ac99e80ae9e323adacf7cf1c Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 7 Jul 2021 13:10:50 +0900 Subject: [PATCH 15/71] purescript: 0.14.2 -> 0.14.3 --- .../development/compilers/purescript/purescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 568407c3614e..adf9dd13c71f 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.2"; + version = "0.14.3"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1ga2hn9br71dyzn3p9jvjiksvnq21p6i5hp1z1j5fpz9la28nqzf"; + sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1kv7dm1nw85lw3brrclkj7xc9p021jx3n8wgp2fg3572s86ypskw"; + sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0"; }; From 6d4b46a56d98c2d8601dedecf1542dda3df51774 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 16/71] ruby: update RVM patchsets --- pkgs/development/interpreters/ruby/rvm-patchsets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 3c2113d608c5..88b75a5aa066 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "28c6469ce841ff3033c376e78a7043009a3bdc5c"; - sha256 = "0kh08hahrwif61sq0qlvgyqiymxi8c8h2dw4s3ln4aq696k4gba9"; + rev = "0251817e2b9d5f73370bbbb12fdf7f7089bd1ac3"; + sha256 = "1biiq5xzzdfb4hr1sgmx14i2nr05xa9w21pc7dl8c5n4f2ilg8ss"; } From 2d420c15598e5eb65e9a1b8419d5ba00778e30da Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 17/71] ruby_2_6: 2.6.7 -> 2.6.8 https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-6-8-released/ --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 9386eb75abdd..c51c785cf640 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -253,10 +253,10 @@ let in { ruby_2_6 = generic { - version = rubyVersion "2" "6" "7" ""; + version = rubyVersion "2" "6" "8" ""; sha256 = { - src = "17m9qxalwhk95dw1qhgxbvr3kkcxs3h86yirfg5mwj35gy5pw8p4"; - git = "08gvknanwdfsaj3lmcv1bdqjf9lldphzi7gmlv3cfa8ligx2vbap"; + src = "0vfam28ifl6h2wxi6p70j0hm3f1pvsp432hf75m5j25wfy2vf1qq"; + git = "0rc3n6sk8632r0libpv8jwslc7852hgk64rvbdrspc9razjwx21c"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 964e0a4e28a8..0575cb626b62 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,7 +1,7 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.6.7" = ops useRailsExpress [ + "2.6.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" From 5f9f17cc11caa07e4a9faa68d308d86e16d0f930 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 18/71] ruby_2_7: 2.7.3 -> 2.7.4 https://www.ruby-lang.org/en/news/2021/07/07/ruby-2-7-4-released/ --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index c51c785cf640..023b45a8e3bb 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -261,10 +261,10 @@ in { }; ruby_2_7 = generic { - version = rubyVersion "2" "7" "3" ""; + version = rubyVersion "2" "7" "4" ""; sha256 = { - src = "0f2kwn98n9h9hy1fd547s7d0a7ga8jjm4nh294bwiwnq65gaj9c9"; - git = "0vxg9w4dgpw2ig5snxmkahvzdp2yh71w8qm49g35d5hqdsql7yrx"; + src = "0nxwkxh7snmjqf787qsp4i33mxd1rbf9yzyfiky5k230i680jhrh"; + git = "1prsrqwkla4k5japlm54k0j700j4824rg8z8kpswr9r3swrmrf5p"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 0575cb626b62..7128c88dee12 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -6,7 +6,7 @@ "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.7.3" = ops useRailsExpress [ + "2.7.4" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" From 7bcc3f619076886c7cf57d620c1db8538d58b465 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 19/71] postgresqlPackages.timescaledb: 2.3.0 -> 2.3.1 https://github.com/timescale/timescaledb/releases/tag/2.3.1 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 4afb4c985441..bebe58676935 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.3.0"; + version = "2.3.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "03k6skl3191i5jby710xr1caq85cvzbjqmqv59mfkfbvihn2zfx2"; + sha256 = "0azcg8fh0bbc4a6b0mghdg4b9v62bb3haaq6cycj40fk4mf1dldx"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ] From afd61a60693e1ad936b8e90bf3f88d438fcafd79 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 20/71] ruby_3_0: 3.0.1 -> 3.0.2 https://www.ruby-lang.org/en/news/2021/07/07/ruby-3-0-2-released/ --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 023b45a8e3bb..3863b97d6b17 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -269,10 +269,10 @@ in { }; ruby_3_0 = generic { - version = rubyVersion "3" "0" "1" ""; + version = rubyVersion "3" "0" "2" ""; sha256 = { - src = "09vpnxxcxc46qv40xbxr9xkdpbgb0imdy25l2vpsxxlr47djb61n"; - git = "0vricyhnnczcbsgvz65pdhi9yx1i34zarbjlc5y5mcmj01y9r7ar"; + src = "1wg6yyzc6arzikcy48igqbxfcdc79bmfpiyfi9m9j1lzmphdx1ah"; + git = "1kbkxqichi11vli080jgyvjf2xgnlbl9l2f2n1hv4s8b31gjib3r"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 7128c88dee12..5c2992bb859b 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -11,7 +11,7 @@ "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "3.0.1" = ops useRailsExpress [ + "3.0.2" = ops useRailsExpress [ "${patchSet}/patches/ruby/3.0/head/railsexpress/01-improve-gc-stats.patch" "${patchSet}/patches/ruby/3.0/head/railsexpress/02-malloc-trim.patch" ]; From 6d21862d8319875b2528dbad9471ed87cf3765b0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 21/71] solargraph: move solargraph to rubyPackages --- .../ruby-modules/solargraph/Gemfile | 2 - .../ruby-modules/solargraph/Gemfile.lock | 64 ---- .../ruby-modules/solargraph/default.nix | 16 - .../ruby-modules/solargraph/gemset.nix | 250 -------------- .../ruby-modules/with-packages/Gemfile | 1 + pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ruby-packages.nix | 319 ++++++++++++------ 7 files changed, 217 insertions(+), 437 deletions(-) delete mode 100644 pkgs/development/ruby-modules/solargraph/Gemfile delete mode 100644 pkgs/development/ruby-modules/solargraph/Gemfile.lock delete mode 100644 pkgs/development/ruby-modules/solargraph/default.nix delete mode 100644 pkgs/development/ruby-modules/solargraph/gemset.nix diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile b/pkgs/development/ruby-modules/solargraph/Gemfile deleted file mode 100644 index 388f96a59b20..000000000000 --- a/pkgs/development/ruby-modules/solargraph/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'solargraph' diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock deleted file mode 100644 index f5e0b5a0a9ea..000000000000 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ /dev/null @@ -1,64 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - ast (2.4.1) - backport (1.1.2) - benchmark (0.1.1) - e2mmap (0.1.0) - jaro_winkler (1.5.4) - kramdown (2.3.0) - rexml - kramdown-parser-gfm (1.1.0) - kramdown (~> 2.0) - mini_portile2 (2.5.0) - nokogiri (1.11.1) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) - parallel (1.20.1) - parser (2.7.2.0) - ast (~> 2.4.1) - racc (1.5.2) - rainbow (3.0.0) - regexp_parser (2.0.3) - reverse_markdown (2.0.0) - nokogiri - rexml (3.2.4) - rubocop (1.7.0) - parallel (~> 1.10) - parser (>= 2.7.1.5) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.2.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (1.4.0) - parser (>= 2.7.1.5) - ruby-progressbar (1.11.0) - solargraph (0.40.1) - backport (~> 1.1) - benchmark - bundler (>= 1.17.2) - e2mmap - jaro_winkler (~> 1.5) - kramdown (~> 2.3) - kramdown-parser-gfm (~> 1.1) - parser (~> 2.3) - reverse_markdown (>= 1.0.5, < 3) - rubocop (>= 0.52) - thor (~> 1.0) - tilt (~> 2.0) - yard (~> 0.9, >= 0.9.24) - thor (1.0.1) - tilt (2.0.10) - unicode-display_width (1.7.0) - yard (0.9.26) - -PLATFORMS - ruby - -DEPENDENCIES - solargraph - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix deleted file mode 100644 index 356224c02309..000000000000 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript }: - -bundlerApp { - pname = "solargraph"; - exes = [ "solargraph" ]; - gemdir = ./.; - - passthru.updateScript = bundlerUpdateScript "solargraph"; - - meta = with lib; { - description = "A Ruby language server"; - homepage = "https://solargraph.org/"; - license = licenses.mit; - maintainers = with maintainers; [ nicknovitski angristan ]; - }; -} diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix deleted file mode 100644 index cd9575f12830..000000000000 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ /dev/null @@ -1,250 +0,0 @@ -{ - ast = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; - type = "gem"; - }; - version = "2.4.1"; - }; - backport = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xmjljpyx5ly078gi0lmmgkv4y0msxxa3hmv74bzxzp3l8qbn5vc"; - type = "gem"; - }; - version = "1.1.2"; - }; - benchmark = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6"; - type = "gem"; - }; - version = "0.1.1"; - }; - e2mmap = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; - type = "gem"; - }; - version = "0.1.0"; - }; - jaro_winkler = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; - type = "gem"; - }; - version = "1.5.4"; - }; - kramdown = { - dependencies = ["rexml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; - type = "gem"; - }; - version = "2.3.0"; - }; - kramdown-parser-gfm = { - dependencies = ["kramdown"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; - type = "gem"; - }; - version = "1.1.0"; - }; - mini_portile2 = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; - type = "gem"; - }; - version = "2.5.0"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; - type = "gem"; - }; - version = "1.11.1"; - }; - parallel = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; - type = "gem"; - }; - version = "1.20.1"; - }; - parser = { - dependencies = ["ast"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; - type = "gem"; - }; - version = "2.7.2.0"; - }; - racc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; - type = "gem"; - }; - version = "1.5.2"; - }; - rainbow = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; - type = "gem"; - }; - version = "3.0.0"; - }; - regexp_parser = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zm86k9q8m5jkcnpb1f93wsvc57saldfj8czxkx1aw031i95inip"; - type = "gem"; - }; - version = "2.0.3"; - }; - reverse_markdown = { - dependencies = ["nokogiri"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6"; - type = "gem"; - }; - version = "2.0.0"; - }; - rexml = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; - type = "gem"; - }; - version = "3.2.4"; - }; - rubocop = { - dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12kkyzyzh30mi9xs52lc1pjki1al4x9acdaikj40wslhpwp1ng1l"; - type = "gem"; - }; - version = "1.7.0"; - }; - rubocop-ast = { - dependencies = ["parser"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qvfp567aprjgcwj757p55ynj0dx2b3c3hd76za9z3c43sphprcj"; - type = "gem"; - }; - version = "1.4.0"; - }; - ruby-progressbar = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; - type = "gem"; - }; - version = "1.11.0"; - }; - solargraph = { - dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0q0dh4da4qygn92vjwqz0w6m4pdhs2zdmrx3zlmxmghizh32ghk7"; - type = "gem"; - }; - version = "0.40.1"; - }; - thor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; - type = "gem"; - }; - version = "1.0.1"; - }; - tilt = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; - type = "gem"; - }; - version = "2.0.10"; - }; - unicode-display_width = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; - type = "gem"; - }; - version = "1.7.0"; - }; - yard = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; - type = "gem"; - }; - version = "0.9.26"; - }; -} diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index bfb52fe72e7a..b3ddb5b13106 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -126,6 +126,7 @@ source 'https://rubygems.org' do gem 'semian' gem 'sequel' gem 'sequel_pg' + gem 'solargraph' gem 'simplecov' gem 'sinatra' gem 'slop' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f24c716a62c..320918922c16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12680,7 +12680,7 @@ in bundler-audit = callPackage ../tools/security/bundler-audit { }; - solargraph = callPackage ../development/ruby-modules/solargraph { }; + solargraph = rubyPackages.solargraph; rbenv = callPackage ../development/ruby-modules/rbenv { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 123bc1ead18b..a32cfbe0df60 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15r6ab17iwhhq92by4ah9z4wwvjbr07qn16x8pn2ypgqwvfy74h7"; + sha256 = "1wswkgwhmfk5j76ar76plhaxna12x0cyf2di57azahlcv88rrwra"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1r3x9fbq5wlgn4xhqw48la09q7f97zna7ld5fglk3jpmh973x5"; + sha256 = "101r0x4lhzp23hksch7z24ajvp549lskxn2cr7pbgr64jjy6v17y"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nqdaykzgib8fsldkxdkw0w44jzz4grvb028crzg0qpwvv03g2wp"; + sha256 = "0mxqpiwgqam5vfk8wsfyj4dpxq0xqqvfbcwx1i4p9n1ahrx7wv7f"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdgv5llgbl4nayx5j78lfvhhjssrzfmypb45mjy37mgm8z5l5m5"; + sha256 = "1pj4xz316b3z56vpb8pnrkwj4rlf3hgas5fhddk6yh7ifrl30sc9"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zfrkcnp9wy1dm4b6iqf29858dp04a62asfmldainqmv4a7931q7"; + sha256 = "1fn488la8dllfg5zhm74k8y23xl9czrzzs55b9v624j43wjhfxcl"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r6db2g3fsrca1hp9kbyvjx9psipsxw0g306qharkcblxl8h1ysn"; + sha256 = "1jqybz7h11xkjpqdffb9gphwmd56lms9xqskza00wd2pswxcwkn4"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p80rbahcxhxlkxgf4bh580hbifn9q4gr5g9fy8fd0z5g6gr9xxq"; + sha256 = "0q00vrknnnhmg02nik06ivrmz7hnq5snpy653kdpskvp4c9ys55c"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpd3hh4ryyr84drj6m0b5sy6929nyf50bfgksw1hpc594542nal"; + sha256 = "0xjy8fg7n5wwv29ngvvdf5r6815s5f0knzyswxh8w6z8f8qj5wr7"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fg58qma2zgrz0gr61p61qcz8c3h88fd5lbdrkpkm96aq5shwh68"; + sha256 = "18897s9h9kha8vgky1yfq4x91m3p81k6rkrb1fgjlnqnvarh9vg0"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sbpkk3r8qi47bd0ilznq4gpfyfwm2bwvxqb5z0wc75h3zj1jhqg"; + sha256 = "03gb6jbvdzm0xlr2g393jvf980ybjf9zzgspl0p4ixh3lcxxr51w"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1csxddyhl6k773ycxjvmyshyr4g9jb1icbs3pnm7crnavqs4h1yr"; + sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; type = "gem"; }; - version = "2.7.0"; + version = "2.8.0"; }; ast = { groups = ["default"]; @@ -147,10 +147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03xphzq4fgva2xiwlpc7jqp0jl6k022gp7alwg0r7vyai0zx6q5n"; + sha256 = "0hb4br24c7awarvcdmairg9g9xs37nlc98fp5abhq3b426zlzskg"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; atomos = { groups = ["default"]; @@ -172,6 +172,16 @@ }; version = "1.9.2"; }; + backport = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xbzzjrgah0f8ifgd449kak2vyf30micpz6x2g82aipfv7ypsb4i"; + type = "gem"; + }; + version = "1.2.0"; + }; bacon = { groups = ["default"]; platforms = []; @@ -182,6 +192,16 @@ }; version = "1.2.0"; }; + benchmark = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6"; + type = "gem"; + }; + version = "0.1.1"; + }; builder = { groups = ["default"]; platforms = []; @@ -219,10 +239,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aq55b8b33pl0yi2abib8i8d22rifji8nzfpf48vj0a0092rllcl"; + sha256 = "161azhqndf9gvnsvsx0k2x2kpalsgmlz233hvwc7ckbiral7q86s"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; camping = { dependencies = ["mab" "rack"]; @@ -643,10 +663,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; crass = { groups = ["default"]; @@ -673,10 +693,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4j6j18ih6lx7gk9jg2p7q8iswc897mgzn5m62jbf0zv0f7mkji"; + sha256 = "0j00s12wn9ai2qinbmzak6v0173cldqllnzs2s2id7gl45py2s75"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.2"; }; daemons = { groups = ["default"]; @@ -771,6 +791,16 @@ }; version = "2.7.6"; }; + e2mmap = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; + type = "gem"; + }; + version = "0.1.0"; + }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; groups = ["default"]; @@ -828,21 +858,41 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19g5nvkycnkzqq4mqn1zjznq9adrlv2jz0dr9w10cbn42hhqpiz7"; + sha256 = "186sra2bww83wa245mhmm57ngdn4w2k2x39iqkmxasjhibg5jsbl"; type = "gem"; }; - version = "0.81.0"; + version = "0.84.0"; }; faraday = { - dependencies = ["faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi"; + sha256 = "0gwbii45plm9bljk22bwzhzxrc5xid8qx24f54vrm74q3zaz00ah"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.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"]; @@ -854,6 +904,16 @@ }; version = "1.1.0"; }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -874,15 +934,25 @@ }; version = "1.1.0"; }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.3"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -944,10 +1014,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; + sha256 = "0mprf1dwznz5ld0q1jpbyl59fwnwk6azspnd0am7zz7kfg3pxhv5"; type = "gem"; }; - version = "0.2.5"; + version = "0.3.0"; }; forwardable-extended = { groups = ["default"]; @@ -985,10 +1055,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jjgqg1iys8k5mjb1wlg8x26d97h1yikgipxwjf9rlyl4i725gn1"; + sha256 = "02618y5gw8sbn258w298894if1xkn5gg7q6wj1sw0bx469xgj256"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; gio2 = { dependencies = ["gobject-introspection"]; @@ -996,10 +1066,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m1dafspwk38jhk8kgk7v1r8pphz42mk9jkz8h3rvlxqnrnsl7sk"; + sha256 = "0wflbi8yhrxv84q6lzrrqvdhpwrcklspkyzwyi47690wlbjff6cl"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; gitlab-markup = { groups = ["default"]; @@ -1017,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qk30k15qk93mhw2dl191akqs9m0016avc8pwzvvcm7gk99qpbxc"; + sha256 = "0aba6j1ixlb5bg2542dhm16c880vdk9cqn70247vhixzc3by0463"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; globalid = { dependencies = ["activesupport"]; @@ -1039,10 +1109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wm1s6xa2cf1n2yvcya8ah57rc0q1klmnrvvdaby3qyn8a6gdlby"; + sha256 = "0rfjkgk5wxs19qah531k6ki6384iqf7b8cbdqc9l6ff9gvkf8cmw"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1131,10 +1201,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; "http_parser.rb" = { groups = ["default"]; @@ -1182,10 +1252,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07vblcyk3g72sbq12xz7xj28snpxnh3sbcnxy8bglqbfqqhvmawr"; + sha256 = "1papdw0503grmbl51jwaa2yn7ndvm94vbdqzz46r25hp3r6d1pls"; type = "gem"; }; - version = "0.1.0"; + version = "0.1.2"; + }; + jaro_winkler = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; + type = "gem"; + }; + version = "1.5.4"; }; jbuilder = { dependencies = ["activesupport"]; @@ -1299,10 +1379,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wbz3cjfrz3ii70lmmyspkm29x2wyr44ly0m818d2w7qi3igq79p"; + sha256 = "1wqpp3m4zwy7l8n8z8d4krvf38q1gfx9lnsyipnfsapspsmsgdb6"; type = "gem"; }; - version = "1.4.12"; + version = "1.4.19"; }; libv8 = { groups = ["default"]; @@ -1351,10 +1431,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w9mbii8515p28xd4k72f3ab2g6xiyq15497ys5r8jn6m355lgi7"; + sha256 = "19vkaazjqyq7yj5ah8rpr4vl9n4mg95scdr5im93akhd5bjvkkly"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.0"; }; mab = { groups = ["default"]; @@ -1409,6 +1489,16 @@ }; version = "0.9.0"; }; + matrix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i"; + type = "gem"; + }; + version = "0.4.2"; + }; mercenary = { groups = ["default"]; platforms = []; @@ -1445,10 +1535,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1phcq7z0zpipwd7y4fbqmlaqghv07fjjgrx99mwq3z3n0yvy7fmi"; + sha256 = "0dlxwc75iy0dj23x824cxpvpa7c8aqcpskksrmb32j6m66h5mkcy"; type = "gem"; }; - version = "3.2021.0225"; + version = "3.2021.0704"; }; mini_magick = { groups = ["default"]; @@ -1465,20 +1555,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np6srnyagghhh2w4nyv09sz47v0i6ri3q6blicj94vgxqp12c94"; + sha256 = "0kb7jq3wjgckmkzna799y5qmvn6vg52878bkgw35qay6lflcrwih"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xg1x4708a4pn2wk8qs2d8kfzzdyv9kjjachg2f1phsx62ap2rx2"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.3"; }; minitest = { groups = ["default"]; @@ -1638,10 +1728,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i80ny61maqzqr1fq5wgpkijmh5j8abisrmhn16kv7mzmxqg5w0m"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.5"; + version = "1.11.7"; }; opus-ruby = { dependencies = ["ffi"]; @@ -1682,10 +1772,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vz880akmcgxf30mrmkld5zyvzr79qaaprnrn10yn7915qsqjh51"; + sha256 = "1xaqx3i4cx7xb5m5qfm7jclq3yyrj8abaqif0q1i72259g5klb8c"; type = "gem"; }; - version = "3.4.4"; + version = "3.4.5"; }; parallel = { groups = ["default"]; @@ -1818,10 +1908,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i"; + sha256 = "0lmaq05a257m9588a81wql3a5p039f221f0dmq57bm2qjwxydjmj"; type = "gem"; }; - version = "5.3.1"; + version = "5.3.2"; }; racc = { groups = ["default"]; @@ -1871,10 +1961,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0flnpli87b9j0zvb3c4l5addjbznbpkbmp1wzfjc1gh8qxlhcs1n"; + sha256 = "0k3d3acac2qn9fg185z3y79nvg4ghr4lyhqiz6mbwlsd7r2nd8mh"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -1904,10 +1994,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17r1pr8d467vh3zkciw4wmrcixj9zjrvd11nxn2z091bkzf66xq2"; + sha256 = "0hwp0qwkphp3fvbsq6ljp8s99v621si9bgqihysz5bv1d1z52mm4"; type = "gem"; }; - version = "6.1.3.2"; + version = "6.1.4"; }; rainbow = { groups = ["default"]; @@ -1982,14 +2072,15 @@ version = "1.4.0"; }; red-colors = { + dependencies = ["matrix"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kdjqvd9zdim2im6492lb4f3559sblrxcnza2xm7j7qr8hhyvisj"; + sha256 = "1xqnbbcqg55abn985m716l6n5izyaaf4zdllhc8095cfqz2fbjcx"; type = "gem"; }; - version = "0.1.2"; + version = "0.3.0"; }; redcarpet = { groups = ["default"]; @@ -2006,10 +2097,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48"; + sha256 = "057xp6bkfpmkq0csd1aa0nji1vjsx8pc0c63blcj6scvi9nh1l5k"; type = "gem"; }; - version = "4.2.5"; + version = "4.3.1"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -2054,6 +2145,17 @@ }; version = "2.1.0"; }; + reverse_markdown = { + dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w6fv779542vdliq2kmikfhymjv55z8mgzblkfjdy2agl07da9c6"; + type = "gem"; + }; + version = "2.0.0"; + }; rexml = { groups = ["default"]; platforms = []; @@ -2154,10 +2256,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xhay8qn3p5f3g6x8i6zh372zk5w2wjrv9dksysxal1r5brkly1w"; + sha256 = "045iralskypd95f42jdgbzp0alv2q0qlvya4qm6bkahg2rfb8s1x"; type = "gem"; }; - version = "1.15.0"; + version = "1.18.3"; }; rubocop-ast = { dependencies = ["parser"]; @@ -2165,10 +2267,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hx4im1a2qpiwipvsl3fma358ixjp4h0mhj56ichq15xrq709qlf"; + sha256 = "1hnrfy928mwpa0ippqs4s8xwghwwp5h853naphgqxcd53l33chlv"; type = "gem"; }; - version = "1.5.0"; + version = "1.7.0"; }; rubocop-performance = { dependencies = ["rubocop" "rubocop-ast"]; @@ -2176,10 +2278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sllna4r40gbw0llh8p9581mfjvi535gfby27m2b11q5x5phrhwc"; + sha256 = "0sl1l9xwvbxbkla5a64avlmyirc2vsbmvqdqza17dydh8m48pb3h"; type = "gem"; }; - version = "1.11.3"; + version = "1.11.4"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -2226,13 +2328,11 @@ groups = ["default"]; platforms = []; source = { - url = "https://github.com/akr/ruby-terminfo"; - rev = "8aaa20b15fcf922239c200a1cccbc8853c397bb4"; - fetchSubmodules = false; - sha256 = "1ak85bmnaqwpyx07wb6wfa2cr06gb30gnmv9knijnsbv4q583xlz"; - type = "git"; + remotes = ["https://rubygems.org"]; + sha256 = "0rl4ic5pzvrpgd42z0c1s2n3j39c9znksblxxvmhkzrc0ckyg2cm"; + type = "gem"; }; - version = "0.2"; + version = "0.1.1"; }; ruby-vips = { dependencies = ["ffi"]; @@ -2271,20 +2371,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.2"; }; rugged = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04aq913plcxjw71l5r62qgz3bx3466p0wvgyfqahg5n3nybmcwqy"; + sha256 = "1dld1z2mdnsf9i4fs74zdr6rfk75pkgzvvyxask5w2dsmkj7bb4m"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; safe_yaml = { groups = ["default"]; @@ -2333,10 +2433,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18b89pmkfnb8q8n3q774ifn317wsxwgcqa0d9zklqsfyrg53768i"; + sha256 = "0qbx9p07jdrnpqvjnq6js9qjwjihsk91c1ndmfap153darp1adw0"; type = "gem"; }; - version = "5.44.0"; + version = "5.46.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -2407,10 +2507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj"; + sha256 = "067bvjmjdjs19bvy138hkqqvw8li3732radcd4x5f5dbf30yk3a9"; type = "gem"; }; - version = "4.9.0"; + version = "4.9.1"; }; snappy = { groups = ["default"]; @@ -2422,6 +2522,17 @@ }; version = "0.2.0"; }; + solargraph = { + dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqmvwh6k638h6r13wsx1l0n0jvz07qys1lr7z8aaynscs0k6hyi"; + type = "gem"; + }; + version = "0.42.3"; + }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; groups = ["default"]; @@ -2490,10 +2601,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sfa4120a7yl3gxjcx990gyawsshfr22gfv5rvgpk72l2p9j2420"; + sha256 = "16x542qnzybzsi65ngd16921m88sh47l8fi21y8gbz08daq4rpab"; type = "gem"; }; - version = "0.14.1"; + version = "0.14.2"; }; tilt = { groups = ["default"]; @@ -2595,10 +2706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; + sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; type = "gem"; }; - version = "0.7.3"; + version = "0.7.5"; }; websocket-extensions = { groups = ["default"]; @@ -2621,15 +2732,15 @@ version = "5.0.2"; }; xcodeproj = { - dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; + dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1411j6sfnz0cx4fiw52f0yqx4bgcn8cmpgi3i5rwmmahayyjz2fn"; + sha256 = "0vcfl87z490xmj4q09davx31r2gzvan95sj90x58wq4ymgrdhf1p"; type = "gem"; }; - version = "1.19.0"; + version = "1.20.0"; }; xctasks = { dependencies = ["nokogiri" "rake"]; From 98e50a7031aa477becd177f6b8a7208c7db73404 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 22/71] terraform_1_0: 1.0.1 -> 1.0.2 https://github.com/hashicorp/terraform/releases/tag/v1.0.2 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 691491ae7fd0..e4a8c0c0abb0 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -194,9 +194,9 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.1"; - sha256 = "0sy33wf2wjhybr5smmyla7ci61w8irk0nrv3vv7h87yli1dd9yj0"; - vendorSha256 = "0ai7h85f0xdlh7q04l4hb9m5wajyqbylhvpjanlhkzvc60silhmx"; + version = "1.0.2"; + sha256 = "0gnv6hajpn1ks4944cr8rgkvly9cgvx4zj1zwc7nf1sikqfa8r1a"; + vendorSha256 = "0q1frza5625b1va0ipak7ns3myca9mb02r60h0py3v5gyl2cb4dk"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; From bf5b00b8ad6b7efabd82f0668ede8a9af43e1fc7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Jul 2021 04:20:00 +0000 Subject: [PATCH 23/71] syncthing: 1.17.0 -> 1.18.0 https://github.com/syncthing/syncthing/releases/tag/v1.18.0 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4b983faaf0b3..9db0abd0cb01 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1bm2xj5ypn63wxxpdix9b4hbam3s2z08jx2rk5adzd5yg499sxx0"; + sha256 = "0hrdlc1dxbxvqxylk0i2f110c6bfp9azsnzqzmjj2b29xxbrmwca"; }; - vendorSha256 = "1jvd7d095wvf94y2di48pvqv9hiw3bj859q5yx9v6lglkwdgz6nw"; + vendorSha256 = "1qqpxm4s1s2yp1zmi4m25y1a6r7kxc5rmvfsg50jmqsfnwligpz6"; doCheck = false; From 13e6525e2d8b1cf2df3f63d3ac12d9f2f7823225 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 7 Jul 2021 06:15:01 +0000 Subject: [PATCH 24/71] leftwm: 0.2.7 -> 0.2.8 --- pkgs/applications/window-managers/leftwm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/leftwm/default.nix b/pkgs/applications/window-managers/leftwm/default.nix index f4b72197f540..ca1a98dcdc35 100644 --- a/pkgs/applications/window-managers/leftwm/default.nix +++ b/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,16 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-nRPt+Tyfq62o+3KjsXkHQHUMMslHFGNBd3s2pTb7l4w="; + sha256 = "sha256-T4A9NGT6sUSTKmLcAWjcp3Y8QQzZFAVSXevXtGm3szY="; }; - cargoSha256 = "sha256-lmzA7XM8B5QJI4Wo0cKeMR3+np6jT6mdGzTry4g87ng="; + cargoSha256 = "sha256-2prRtdBxpYc2xI/bLZNlqs3mxESfO9GhNUSlKFF//eE="; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libX11 libXinerama ]; From 358ebd190d83fcb4ee873edac82d7ced1dc3d66a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 08:36:17 +0200 Subject: [PATCH 25/71] python3Packages.mcstatus: 6.2.0 -> 6.4.0 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 165885c02252..31ce83512af2 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.2.0"; + version = "6.4.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o5JVj4Tt5+VOjDC0TDlVuVbDUQPvZGX5Zeoz0vVxPJ8="; + sha256 = "sha256-pJ5TY9tbdhVW+kou+n5fMgCdHVBK6brBrlGIuO+VIK0="; }; propagatedBuildInputs = [ From 176fc1a6e62a57bfb7a0878a3b15f0c1a91b80a9 Mon Sep 17 00:00:00 2001 From: nick black Date: Wed, 7 Jul 2021 01:29:19 -0400 Subject: [PATCH 26/71] notcurses: 2.2.4 -> 2.3.8 --- pkgs/development/libraries/notcurses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix index dd2a816f7d32..725392772d8d 100644 --- a/pkgs/development/libraries/notcurses/default.nix +++ b/pkgs/development/libraries/notcurses/default.nix @@ -3,7 +3,7 @@ multimediaSupport ? true }: let - version = "2.2.4"; + version = "2.3.8"; in stdenv.mkDerivation { pname = "notcurses"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-FScs6eQxhRMEyPDSD+50RO1B6DIAo+KnvHP3RO2oAnw="; + sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E="; }; meta = { From 1cfc10e797bedd4531da45b7543b860c09911c4a Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Wed, 7 Jul 2021 15:46:28 +0800 Subject: [PATCH 27/71] stevenblack-blocklist: 3.7.12 -> 3.7.13 --- pkgs/tools/networking/stevenblack-blocklist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index b8b045831088..ebbaaa73fce1 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.12"; + version = "3.7.13"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-hGaiIFHgsLb6oLJ4k4yfxqeDhK0W+diCAI5odo08Q0E="; + sha256 = "sha256-nSajiRDpcFp3MwnQPnoBVB/OWnhVqkeSmS7OBrfhMnw="; meta = with lib; { description = "Unified hosts file with base extensions"; From b4928b4e2e9a3ff10eca402ecd3b0bc2320bb5b6 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 7 Jul 2021 10:19:21 +0200 Subject: [PATCH 28/71] neogit: add missing dependency on plenary.nvim --- pkgs/misc/vim-plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index e10cf541066c..6c2063e0a970 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -395,6 +395,10 @@ self: super: { dependencies = with self; [ ultisnips ]; }); + neogit = super.neogit.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { dependencies = with self; [ popfix ]; }); From 50a10986ec1dc3a11165c8e734ccfb03f0236b65 Mon Sep 17 00:00:00 2001 From: Vanilla Date: Wed, 7 Jul 2021 16:23:04 +0800 Subject: [PATCH 29/71] mdbook: 0.4.9 -> 0.4.10 --- pkgs/tools/text/mdbook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index a8c5efb0a493..dd6265b5b348 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "sha256-wc3poiLnIHbbl0j2sWQkEbxccpohPnvjLPdNuKfsDSY="; + sha256 = "sha256-1Ddy/kb2Q7P+tzyEr3EC3qWm6MGSsDL3/vnPJLAm/J0="; }; - cargoSha256 = "sha256-2DNfacPp9IMke2j8WYxpGmMxityaFGyXrc0jOyqPl3c="; + cargoSha256 = "sha256-x2BwnvEwTqz378aDE7OHWuEwNEsUnRudLq7sUJjHRpA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 445c3649b6e433eb5c25c5eb25912eb0111cb8d6 Mon Sep 17 00:00:00 2001 From: Romain Davaze Date: Wed, 7 Jul 2021 10:27:35 +0200 Subject: [PATCH 30/71] terraform-providers.keycloak: 3.0.0 -> 3.1.1 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e738a6ad7753..02372539b02c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -533,10 +533,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.0.0", - "sha256": "1q9vzmj9c7mznv6al58d3rs5kk1fh28k1qccx46hcbk82z52da3a", - "vendorSha256": "0kh6lljvqd577s19gx0fmfsmx9wm3ikla3jz16lbwwb8ahbqcw1f", - "version": "3.0.0" + "rev": "v3.1.1", + "sha256": "0qh0y1j3y5hzcr8h8wzralv7h8dmrg8jnjccz0fzcmhbkazfrs4p", + "vendorSha256": "0il4rvwa23zghrq0b8qrzgxyjy0211v9z2a4ln2xmlhcz0105zg8", + "version": "3.1.1" }, "ksyun": { "owner": "terraform-providers", From 315e3cfc9aafb7e52b988db27f68d8f83b4d7e04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 10:30:01 +0200 Subject: [PATCH 31/71] python3Packages.dependency-injector: 4.32.2 -> 4.34.0 --- .../python-modules/dependency-injector/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 8958566070ed..d220bd51ac1c 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dependency-injector"; - version = "4.32.2"; + version = "4.34.0"; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; rev = version; - sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg"; + sha256 = "sha256-MI0+saRe4Zi77otVPGYxrX9z8Jc5K1A1sCxHBS0uta0="; }; propagatedBuildInputs = [ @@ -42,6 +42,11 @@ buildPythonPackage rec { pyyaml ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "six>=1.7.0,<=1.15.0" "six" + ''; + disabledTestPaths = [ # There is no unique identifier to disable the one failing test "tests/unit/ext/test_aiohttp_py35.py" From e6fb1bb60e3d6f6f9916aa7d9d8bc7f17d3fcc9d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 21:43:13 +0200 Subject: [PATCH 32/71] python3Packages.graphene: fix build --- pkgs/development/python-modules/graphene/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix index be2cc808eb0d..c2776e20e2bb 100644 --- a/pkgs/development/python-modules/graphene/default.nix +++ b/pkgs/development/python-modules/graphene/default.nix @@ -25,9 +25,8 @@ buildPythonPackage rec { sha256 = "sha256-bVCCLPnV5F8PqLMg3GwcpwpGldrxsU+WryL6gj6y338="; }; - # Allow later aniso8601 releases - # https://github.com/graphql-python/graphene/pull/1331 patches = [ (fetchpatch { + # Allow later aniso8601 releases, https://github.com/graphql-python/graphene/pull/1331 url = "https://github.com/graphql-python/graphene/commit/26b16f75b125e35eeb2274b7be503ec29f2e8a45.patch"; sha256 = "qm96pNOoxPieEy1CFZpa2Mx010pY3QU/vRyuL0qO3Tk="; }) ]; @@ -50,6 +49,11 @@ buildPythonPackage rec { pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ + # TypeError: Failed: DID NOT RAISE Date: Tue, 6 Jul 2021 21:33:37 +0200 Subject: [PATCH 33/71] python3Packages.starlette: fix build --- pkgs/development/python-modules/starlette/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 694b678930b2..3079b60564f1 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -53,9 +53,13 @@ buildPythonPackage rec { typing-extensions ]; - # fails to import graphql, but integrated graphql support is about to - # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. - disabledTestPaths = [ "tests/test_graphql.py" ]; + disabledTestPaths = [ + # fails to import graphql, but integrated graphql support is about to + # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. + "tests/test_graphql.py" + # contextfunction was removed in Jinja 3.1 + "tests/test_templates.py" + ]; pythonImportsCheck = [ "starlette" ]; From b57c87ae7d20e57989064a28b7bb940ddd884242 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Wed, 7 Jul 2021 10:29:07 +0000 Subject: [PATCH 34/71] btcpayserver: 1.1.1 -> 1.1.2 --- pkgs/applications/blockchains/btcpayserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 7b6e3918da58..d942ac768a83 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "btcpayserver"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-cCm4CZdVtjO2nj69CgRCrcwO0lAbiQVD6KocOj4CSdY="; + sha256 = "sha256-A9XIKCw1dL4vUQYSu6WdmpR82dAbtKVTyjllquyRGgs="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; From cf2bee80eb2c370610232334da4ea008ad4221e8 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Wed, 7 Jul 2021 10:32:59 +0000 Subject: [PATCH 35/71] nbxplorer: 2.1.51 -> 2.1.52 --- .../blockchains/nbxplorer/default.nix | 4 ++-- pkgs/applications/blockchains/nbxplorer/deps.nix | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/blockchains/nbxplorer/default.nix b/pkgs/applications/blockchains/nbxplorer/default.nix index 7e279b226961..40deef62c2ce 100644 --- a/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/pkgs/applications/blockchains/nbxplorer/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "nbxplorer"; - version = "2.1.51"; + version = "2.1.52"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-tvuuoDZCSDFa8gAVyH+EP1DLtdPfbkr+w5lSxZkzZXg="; + sha256 = "sha256-+BP71TQ8BTGZ/SbS7CrI4D7hcQaVLt+hCpInbOdU5GY="; }; nativeBuildInputs = [ dotnetSdk dotnetPackages.Nuget makeWrapper ]; diff --git a/pkgs/applications/blockchains/nbxplorer/deps.nix b/pkgs/applications/blockchains/nbxplorer/deps.nix index de75ad228d3a..b7b01b14bff5 100644 --- a/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -181,23 +181,23 @@ }) (fetchNuGet { name = "NBitcoin.Altcoins"; - version = "2.0.31"; - sha256 = "13gcfsxpfq8slmsvgzf6iv581x7n535zq0p9c88bqs5p88r6lygm"; + version = "2.0.33"; + sha256 = "12r4w89247xzrl2g01iv13kg1wl7gzfz1zikimx6dyhr4iipbmgf"; }) (fetchNuGet { name = "NBitcoin.TestFramework"; - version = "2.0.22"; - sha256 = "1zwhjy6xppl01jhkgl7lqjsmi8crny4qq22ml20cz8l437j1zi4n"; + version = "2.0.23"; + sha256 = "03jw3gay7brm7s7jwn4zbk1n1sq7gck523cx3ckx87v3wi2062lx"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.76"; - sha256 = "0q3ilmsrw9ip1s38qmfs4qi02xvccmy1naafffn5yxj08q0n1p79"; + version = "5.0.78"; + sha256 = "1mfn045l489bm2xgjhvddhfy4xxcy42q6jhq4nyd6fnxg4scxyg9"; }) (fetchNuGet { name = "NBitcoin"; - version = "5.0.77"; - sha256 = "0ykz4ii6lh6gdlz6z264wnib5pfnmq9q617qqbg0f04mq654jygb"; + version = "5.0.81"; + sha256 = "1fba94kc8yzykb1m5lvpx1hm63mpycpww9cz5zfp85phs1spdn8x"; }) (fetchNuGet { name = "NETStandard.Library"; From 72593ad85996c02e2072cdc19a272614a7179a06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 13:18:34 +0200 Subject: [PATCH 36/71] python3Packages.distutils-extra: 2.39 -> 2.45 --- .../python-modules/distutils_extra/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix index c2fbcdfe46c9..ffa49fec14df 100644 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ b/pkgs/development/python-modules/distutils_extra/default.nix @@ -5,17 +5,22 @@ buildPythonPackage rec { pname = "distutils-extra"; - version = "2.39"; + version = "2.45"; src = fetchurl { - url = "https://launchpad.net/python-distutils-extra/trunk/${version}/+download/python-${pname}-${version}.tar.gz"; - sha256 = "1bv3h2p9ffbzyddhi5sccsfwrm3i6yxzn0m06fdxkj2zsvs28gvj"; + url = "https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/${version}/python-${pname}-${version}.tar.bz2"; + sha256 = "1aifizd4nkvdnkwdna7i6xgjcqi1cf228bg8kmnwz67f5rflk3z8"; }; + # Tests are out-dated as the last upstream release is from 2016 + doCheck = false; + + pythonImportsCheck = [ "DistUtilsExtra" ]; + meta = with lib; { - homepage = "https://launchpad.net/python-distutils-extra"; description = "Enhancements to Python's distutils"; - license = licenses.gpl2; + homepage = "https://launchpad.net/python-distutils-extra"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fab ]; }; - } From c7ddc7e001b755d77c42899b87b5bc7d06831b58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 7 Jul 2021 13:56:07 +0200 Subject: [PATCH 37/71] pinfo: 0.6.10 -> 0.6.13 --- pkgs/applications/misc/pinfo/default.nix | 45 +++++++++++++++++------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 8668807e81cc..b0fc64a1a5e9 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -1,24 +1,45 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }: +{ lib +, autoreconfHook +, fetchFromGitHub +, gettext +, ncurses +, readline +, stdenv +, texinfo +}: -stdenv.mkDerivation { - name = "pinfo-0.6.10"; +stdenv.mkDerivation rec { + pname = "pinfo"; + version = "0.6.13"; - src = fetchurl { - # homepage needed you to login to download the tarball - url = "https://src.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" - + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2"; - sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; + src = fetchFromGitHub { + owner = "baszoetekouw"; + repo = pname; + rev = "v${version}"; + sha256 = "173d2p22irwiabvr4z6qvr6zpr6ysfkhmadjlyhyiwd7z62larvy"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ gettext texinfo ncurses readline ]; + nativeBuildInputs = [ + autoreconfHook + ]; - configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ]; + buildInputs = [ + gettext + texinfo + ncurses + readline + ]; + + configureFlags = [ + "--with-curses=${ncurses.dev}" + "--with-readline=${readline.dev}" + ]; meta = with lib; { description = "A viewer for info files"; + homepage = "https://github.com/baszoetekouw/pinfo"; license = licenses.gpl2Plus; platforms = platforms.unix; + maintainers = with maintainers; [ fab ]; }; } - From 4af078aec8e68b7ecc5ef9afe39899da4e75d4aa Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 7 Jul 2021 22:25:01 +0800 Subject: [PATCH 38/71] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 6 ++++++ .../transitive-broken.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f21266e5004d..13bd569a443a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -74,6 +74,7 @@ broken-packages: - aeson-filthy - aeson-flowtyped - aeson-match-qq + - aeson-modern-tojson - aeson-options - aeson-prefix - aeson-schema @@ -261,6 +262,7 @@ broken-packages: - aws-route53 - aws-sdk-text-converter - aws-simple + - aws-xray-client-persistent - axel - azubi - azure-acs @@ -1904,6 +1906,7 @@ broken-packages: - haskell-src-match - haskell-src-meta-mwotton - haskell-stack-trace-plugin + - haskell-to-elm - HaskellTorrent - HaskellTutorials - haskell-type-exts @@ -2755,6 +2758,7 @@ broken-packages: - linear-maps - linear-opengl - linearscan + - linear-smc - linear-vect - line-drawing - lines-of-action @@ -3183,6 +3187,7 @@ broken-packages: - nested-sequence - netclock - netease-fm + - net-mqtt-rpc - netrium - NetSNMP - netspec @@ -4511,6 +4516,7 @@ broken-packages: - streaming-png - streaming-utils - streaming-with + - streamly-examples - streamly-fsnotify - stream-monad - streamproc diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fdad31819ac5..6ecf31c7da78 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -564,6 +564,7 @@ dont-distribute-packages: - bip32 - birch-beer - bird + - biscuit-servant - bit-array - bitcoin-address - bitcoin-api @@ -2344,6 +2345,7 @@ dont-distribute-packages: - polysemy-path - polysemy-plugin - polysemy-readline + - polysemy-req - polysemy-resume - polysemy-test - polysemy-time diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 736a1b71c959..807d8a9bf0e4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24846,6 +24846,8 @@ self: { testHaskellDepends = [ aeson base inspection-testing ]; description = "Provide a handy way for derving ToJSON proprely"; license = lib.licenses.isc; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aeson-native" = callPackage @@ -37006,6 +37008,8 @@ self: { ]; description = "A client for AWS X-Ray integration with Persistent"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aws-xray-client-wai" = callPackage @@ -42449,6 +42453,7 @@ self: { ]; description = "Servant support for the Biscuit security token"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bisect-binary" = callPackage @@ -120141,6 +120146,8 @@ self: { ]; description = "Generate Elm types and JSON encoders and decoders from Haskell types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskell-token-utils" = callPackage @@ -163827,6 +163834,8 @@ self: { testHaskellDepends = [ array base constraints ]; description = "Build SMC morphisms using linear types"; license = lib.licenses.lgpl3Plus; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "linear-socket" = callPackage @@ -184560,6 +184569,8 @@ self: { ]; description = "Make RPC calls via an MQTT broker"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "net-spider" = callPackage @@ -205650,6 +205661,7 @@ self: { libraryHaskellDepends = [ base polysemy req ]; description = "Polysemy effect for req"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-resume" = callPackage @@ -250172,6 +250184,8 @@ self: { ]; description = "Examples for Streamly"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "streamly-fsnotify" = callPackage From fadf584df5fc0ae438f8a8b8fd779d8f14bf34ef Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 7 Jul 2021 16:28:59 +0200 Subject: [PATCH 39/71] Revert "neovim: remove lua override" This reverts commit 68a780e669e8dcc3abf7d2b9f0b1e3bf7cf2e76b. Also, add some context --- pkgs/top-level/all-packages.nix | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0b60596998..994d2017d57a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27487,7 +27487,32 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - lua = luajit; + # neovim doesn't build with luajit on aarch64: + # ./luarocks init + # PANIC: unprotected error in call to Lua API (module 'luarocks.core.hardcoded' not found: + # no field package.preload['luarocks.core.hardcoded'] + # no file '/private/tmp/nix-build-luarocks-3.2.1.drv-0/source/src/luarocks/core/hardcoded.lua' + # no file './luarocks/core/hardcoded.lua' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/luajit-2.1.0-beta3/luarocks/core/hardcoded.lua' + # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded.lua' + # no file '/usr/local/share/lua/5.1/luarocks/core/hardcoded/init.lua' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded.lua' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/share/lua/5.1/luarocks/core/hardcoded/init.lua' + # no file './luarocks/core/hardcoded.so' + # no file '/usr/local/lib/lua/5.1/luarocks/core/hardcoded.so' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks/core/hardcoded.so' + # no file '/usr/local/lib/lua/5.1/loadall.so' + # no file './luarocks.so' + # no file '/usr/local/lib/lua/5.1/luarocks.so' + # no file '/nix/store/3s6c509q9vvq3db87rfi7qa38wzxwz8w-luajit-2.1.0-2021-05-29/lib/lua/5.1/luarocks.so' + # no file '/usr/local/lib/lua/5.1/loadall.so') + # make: *** [GNUmakefile:57: luarocks] Error 1 + # + # See https://github.com/NixOS/nixpkgs/issues/129099 + # Possibly related: https://github.com/neovim/neovim/issues/7879 + lua = + if stdenv.isAarch64 then lua5_1 else + luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; From 8560dc854943ee35d420ccdc591adbc20d1b52f1 Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 7 Jul 2021 17:13:57 +0200 Subject: [PATCH 40/71] cypress: 7.5.0 -> 7.7.0 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 9563563bc427..0b61aa23086f 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.5.0"; + version = "7.7.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj"; + sha256 = "1mr46raha5aqi8ba0cqvyil5z4vcr46hnxqqmpk3fkrr8awd2897"; }; passthru.updateScript = ./update.sh; From 05bfb6bd473668ff1977bd34f9aa44186c2d9073 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 7 Jul 2021 18:00:15 +0200 Subject: [PATCH 41/71] texmacs: 1.99.19 -> 2.1 --- pkgs/applications/editors/texmacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index d628eeadab6e..427d0aa3ace8 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -16,7 +16,7 @@ let pname = "TeXmacs"; - version = "1.99.19"; + version = "2.1"; common = callPackage ./common.nix { inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; }; @@ -26,7 +26,7 @@ mkDerivation { src = fetchurl { url = "https://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "1izwqb0z4gqiglv57mjswk6sjivny73kd2sxrf3nmj7wr12pn5m8"; + sha256 = "1gl6k1bwrk1y7hjyl4xvlqvmk5crl4jvsk8wrfp7ynbdin6n2i48"; }; nativeBuildInputs = [ cmake pkg-config ]; From 17d2bc7eeb4640a9fc75607111d2688f677bf248 Mon Sep 17 00:00:00 2001 From: Michael Reilly Date: Wed, 7 Jul 2021 12:04:57 -0400 Subject: [PATCH 42/71] katago: Corrected git commit hash to be the tagged version, not the old tagged version --- pkgs/games/katago/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 2457cd1cf961..fb08ef44710e 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -34,7 +34,7 @@ let in env.mkDerivation rec { pname = "katago"; version = "1.9.1"; - githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362"; + githash = "c3220a5a404af835792c476f3f24904e4b799444"; src = fetchFromGitHub { owner = "lightvector"; From a79e9212ec4d47ccb2014cadaa40578532e6868e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 7 Jul 2021 18:58:33 +0200 Subject: [PATCH 43/71] python3Packages.maestral: 1.4.5 -> 1.4.6 --- pkgs/development/python-modules/maestral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index d974038e7b0a..50180f43b8ed 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.4.5"; + version = "1.4.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "sha256-kyOBF+qsl/+9u0P+EmfxbuJNGMqPSLCWJUlcZMyKJH4="; + sha256 = "sha256-kaRcM8Z0xeDp3JYputKZmzTfYYq2oKpF7AM6ciFF7I4="; }; propagatedBuildInputs = [ From d20231f714e6e50cfce3d1deb65afa154461ce33 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 7 Jul 2021 18:58:49 +0200 Subject: [PATCH 44/71] maestral-gui: 1.4.5 -> 1.4.6 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 53b439b9f715..18189f64a6d6 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.4.5"; + version = "1.4.6"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "sha256-HaEQTmpyM1r/+rTkki93aStdzdnhNmkfNJTZRTPehTw="; + sha256 = "sha256-Y4n67LJyNUsLmGMu7B73n888qmCQ9HjxCSM1MlfTbqQ="; }; propagatedBuildInputs = with python3.pkgs; [ From 46cf01729b12cabe1a3c5ab18959b3d7dd897af5 Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Wed, 7 Jul 2021 21:40:52 +0300 Subject: [PATCH 45/71] tmuxinator: 2.0.3 -> 3.0.1 --- pkgs/tools/misc/tmuxinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index c3ceae7a0bd3..c248546fdb49 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.3"; - source.sha256 = "0js43hl07is9nx1b17g8x2blh1q7ls8y4dshcb50r5dn7drpardh"; + version = "3.0.1"; + source.sha256 = "1vm96iyzbcy1388b3zyqivfhs4p63v87mp5qwlr4s8i2haq62xyf"; erubis = buildRubyGem rec { inherit ruby; From c08ea1ff47e663208892f8120b07a6b5327d5e59 Mon Sep 17 00:00:00 2001 From: Red Davies Date: Wed, 7 Jul 2021 14:42:40 -0400 Subject: [PATCH 46/71] ponyc: 0.41.1 -> 0.42.0 * Don't allow PONYPATH to override standard library (PR #3780) * Fix bug where Flags.remove could set flags in addition to unsetting them (PR #3777) * Allow Flags instances to be created with a set bit encoding (PR #3778) * Fix "iftype" expressions not being usable in lambdas or object literals (PR #3763) * Fix code generation for variadic FFI functions on arm64 (PR #3768) --- pkgs/development/compilers/ponyc/default.nix | 4 ++-- .../compilers/ponyc/make-safe-for-sandbox.patch | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 36a83d47d6fd..086d4d30127e 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation (rec { pname = "ponyc"; - version = "0.41.1"; + version = "0.42.0"; src = fetchFromGitHub { owner = "ponylang"; repo = pname; rev = version; - sha256 = "02wx070cy1193xzv58vh79yzwgpqiayqlwd3i285698fppbcg69a"; + sha256 = "1s8glmzz0g5lj1fjwwy4m3n660smiq5wl9r1lg686wqh42hcgnsy"; # Due to a bug in LLVM 9.x, ponyc has to include its own vendored patched # LLVM. (The submodule is a specific tag in the LLVM source tree). diff --git a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch index 49addcbc616e..8190cc2ee02e 100644 --- a/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch +++ b/pkgs/development/compilers/ponyc/make-safe-for-sandbox.patch @@ -1,21 +1,21 @@ ---- a/lib/CMakeLists.txt 2021-05-27 15:58:36.819331229 -0400 -+++ b/lib/CMakeLists.txt 2021-05-27 16:00:19.768268649 -0400 -@@ -10,12 +10,12 @@ +--- a/lib/CMakeLists.txt.orig 2021-07-07 13:40:20.209410160 -0400 ++++ a/lib/CMakeLists.txt 2021-07-07 13:43:11.886969662 -0400 +@@ -15,12 +15,12 @@ endif() ExternalProject_Add(gbenchmark -- URL https://github.com/google/benchmark/archive/v1.5.2.tar.gz -+ SOURCE_DIR gbenchmark-prefix/src/benchmark +- URL ${PONYC_GBENCHMARK_URL} ++ SOURCE_DIR gbenchmark-prefix/src/benchmark CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DCMAKE_CXX_FLAGS=-fpic --no-warn-unused-cli ) ExternalProject_Add(googletest - URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz -+ URL @googletest@ ++ URL @googletest@ CMAKE_ARGS -DCMAKE_BUILD_TYPE=${PONYC_LIBS_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DCMAKE_CXX_FLAGS=-fpic -Dgtest_force_shared_crt=ON --no-warn-unused-cli ) -@@ -28,75 +28,6 @@ +@@ -33,75 +33,6 @@ COMPONENT library ) From 1947733a32019fda3847d74061749c883d299786 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Wed, 7 Jul 2021 19:29:52 +0000 Subject: [PATCH 47/71] polkadot: 0.9.7 -> 0.9.8 --- pkgs/applications/blockchains/polkadot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 8c549ee4e796..a1f0b17b2020 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-swPLJIcm8XD0+/e9pGK2bDqUb7AS/5FdQ3A7Ceh5dZc="; + sha256 = "sha256-5PNogoahAZUjIlQsVXwm7j5OmP3/uEEdV0vrIDXXBx8="; }; - cargoSha256 = "sha256-4njx8T3kzyN63Jo0aHee5ImqcObiADvi+dHKWcRmbQw="; + cargoSha256 = "0iikys90flzmnnb6l2wzag8mp91p6z9y7rjzym2sd6m7xhgbc1x6"; nativeBuildInputs = [ clang ]; From 82a2deced8e02f3875419272d1481910011c3872 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 7 Jul 2021 22:20:17 +0200 Subject: [PATCH 48/71] fcft: 2.4.1 -> 2.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes a “rare crash”: https://codeberg.org/dnkl/fcft/releases/tag/2.4.2 --- pkgs/development/libraries/fcft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 9018a1bfa218..3634b4a2cab1 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fcft"; - version = "2.4.1"; + version = "2.4.2"; src = fetchzip { url = "https://codeberg.org/dnkl/fcft/archive/${version}.tar.gz"; - sha256 = "sha256-QxAp6pnZPLPwarurbKovz0BVOO4XdckBzjB65XCBPAM="; + sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; From 9c64ca69121718023d2a83b56a270b6cc5b4c9fc Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Mon, 3 May 2021 23:46:29 +0200 Subject: [PATCH 49/71] workstyle: 0.2.1 -> unstable-2021-05-09 --- pkgs/applications/window-managers/i3/workstyle.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/applications/window-managers/i3/workstyle.nix index b245139abefe..3f7c252c2c33 100644 --- a/pkgs/applications/window-managers/i3/workstyle.nix +++ b/pkgs/applications/window-managers/i3/workstyle.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "workstyle"; - version = "0.2.1"; + version = "unstable-2021-05-09"; src = fetchFromGitHub { owner = "pierrechevalier83"; repo = pname; - rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9"; - sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn"; + rev = "f2023750d802259ab3ee7d7d1762631ec157a0b1"; + sha256 = "04xds691sw4pi2nq8xvdhn0312wwia60gkd8b1bjqy11zrqbivbx"; }; - cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54"; + cargoSha256 = "0xwv8spr96z4aimjlr15bhwl6i3zqp7jr45d9zr3sbi9d8dbdja2"; doCheck = false; # No tests From 5ec78c03ce0edc82d33f6a4e4f6c243ce8d96cb1 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Jul 2021 06:49:37 +0300 Subject: [PATCH 50/71] change various expressions to use pname and version --- .../tools/literate-programming/funnelweb/default.nix | 5 +++-- .../tools/misc/editorconfig-core-c/default.nix | 7 +++---- pkgs/development/tools/misc/rolespec/default.nix | 7 ++----- pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix | 6 +++--- pkgs/tools/admin/sec/default.nix | 6 +++--- pkgs/tools/misc/lnav/default.nix | 8 +++----- pkgs/tools/misc/yank/default.nix | 8 +++----- 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix index 53b7f208e812..56d53104a206 100644 --- a/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -1,8 +1,9 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { + pname = "funnelweb"; + version = "3.20"; - name = "funnelweb-${meta.version}"; src = fetchurl { url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz"; sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index de5c1e070fdb..f48ba999d868 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchgit, cmake, pcre, doxygen }: stdenv.mkDerivation rec { - name = "editorconfig-core-c-${meta.version}"; + pname = "editorconfig-core-c"; + version = "0.12.1"; src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-c.git"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "0awpb63ci85kal3pnlj2b54bay8igj1rbc13d8gqkvidlb51nnx4"; fetchSubmodules = true; - inherit name; }; buildInputs = [ pcre ]; @@ -31,7 +31,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; license = with licenses; [ bsd2 bsd3 ]; - version = "0.12.1"; maintainers = with maintainers; [ dochang ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index b26fbf75031d..7b084fae891e 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { - - name = "rolespec-${meta.version}"; + pname = "rolespec"; + version = "20161104"; src = fetchFromGitHub { owner = "nickjj"; repo = "rolespec"; rev = "d9ee530cd709168882059776c482fc37f46cb743"; sha256 = "1jkidw6aqr0zfqwmcvlpi9qa140z2pxcfsd43xm5ikx6jcwjdrzl"; - inherit name; }; nativeBuildInputs = [ makeWrapper ]; @@ -41,9 +40,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/nickjj/rolespec"; license = licenses.gpl3; - version = "20161104"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; - } diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 6eebfe64d5a7..d32968cc45c3 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -1,10 +1,11 @@ { coreutils, dpkg, fetchurl, gnugrep, gnused, makeWrapper, mfcl2700dnlpr, perl, lib, stdenv }: stdenv.mkDerivation rec { - name = "mfcl2700dncupswrapper-${meta.version}"; + pname = "mfcl2700dncupswrapper"; + version = "3.2.0-1"; src = fetchurl { - url = "https://download.brother.com/welcome/dlf102086/${name}.i386.deb"; + url = "https://download.brother.com/welcome/dlf102086/mfcl2700dncupswrapper-${version}.i386.deb"; sha256 = "07w48mah0xbv4h8vsh1qd5cd4b463bx8y6gc5x9pfgsxsy6h6da1"; }; @@ -39,6 +40,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.linux; - version = "3.2.0-1"; }; } diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index fe3517c6196c..0afac976d09e 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -1,12 +1,13 @@ { fetchFromGitHub, perl, lib, stdenv }: stdenv.mkDerivation rec { - name = "sec-${meta.version}"; + pname = "sec"; + version = "2.8.3"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; - rev = meta.version; + rev = version; sha256 = "0ryic5ilj1i5l41440i0ss6j3yv796fz3gr0qij5pqyd1z21md83"; }; @@ -27,6 +28,5 @@ stdenv.mkDerivation rec { description = "Simple Event Correlator"; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.all; - version = "2.8.3"; }; } diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 4d9364ff23e4..373687fafdf1 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -2,15 +2,14 @@ , readline, zlib, bzip2, autoconf, automake, curl }: stdenv.mkDerivation rec { - - name = "lnav-${meta.version}"; + pname = "lnav"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tstack"; repo = "lnav"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; - inherit name; }; buildInputs = [ @@ -47,7 +46,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.9.0"; maintainers = with maintainers; [ dochang ma27 ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 19a4ba986ff2..dbbe14cf3864 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -1,15 +1,14 @@ { lib, stdenv, fetchFromGitHub, xsel }: stdenv.mkDerivation rec { - - name = "yank-${meta.version}"; + pname = "yank"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mptre"; repo = "yank"; - rev = "v${meta.version}"; + rev = "v${version}"; sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; - inherit name; }; installFlags = [ "PREFIX=$(out)" ]; @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/mptre/yank/releases"; license = licenses.mit; - version = "1.2.0"; maintainers = [ maintainers.dochang ]; platforms = platforms.unix; }; From d8a87e89e7147cfa96c6ee37c0dc854555d75689 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Jul 2021 07:06:41 +0300 Subject: [PATCH 51/71] switch mercurial_4 and tortoisehg to pname --- .../version-management/mercurial/4.9.nix | 18 ++++++--------- .../version-management/tortoisehg/default.nix | 22 +++++++++---------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index 030a35212ec6..0a76f7df9704 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,21 +1,19 @@ { lib, stdenv, fetchurl, python2Packages, makeWrapper , guiSupport ? false, tk ? null , ApplicationServices -, mercurialSrc ? fetchurl rec { - meta.name = "mercurial-${meta.version}"; - meta.version = "4.9.1"; - url = "https://mercurial-scm.org/release/${meta.name}.tar.gz"; - sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; - } }: let inherit (python2Packages) docutils hg-git dulwich python; -in python2Packages.buildPythonApplication { +in python2Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "4.9.1"; - inherit (mercurialSrc.meta) name version; - src = mercurialSrc; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "0iybbkd9add066729zg01kwz5hhc1s6lhp9rrnsmzq6ihyxj3p8v"; + }; format = "other"; @@ -59,7 +57,6 @@ in python2Packages.buildPythonApplication { ''; meta = { - inherit (mercurialSrc.meta) version; description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; @@ -69,4 +66,3 @@ in python2Packages.buildPythonApplication { platforms = lib.platforms.unix; }; } - diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 17cde4c8a540..73d8f3aa5ec2 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,20 +1,18 @@ { lib, fetchurl, python3Packages , mercurial, qt5 }: -let - tortoisehgSrc = fetchurl rec { - meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.8"; - url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz"; - sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; - }; - # Extension point for when thg's mercurial is lagging behind mainline. - tortoiseMercurial = mercurial; +python3Packages.buildPythonApplication rec { + pname = "tortoisehg"; + version = "5.8"; -in python3Packages.buildPythonApplication { - inherit (tortoisehgSrc.meta) name version; - src = tortoisehgSrc; + src = fetchurl { + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; + sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; + }; + + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; propagatedBuildInputs = with python3Packages; [ tortoiseMercurial qscintilla-qt5 iniparse From 1422563f54681f3ea3805fa1b8f3571f20dd7e19 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 1 Jul 2021 00:37:24 +0300 Subject: [PATCH 52/71] hplip: add -n to gzip to improve reproducibility --- pkgs/misc/drivers/hplip/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 0decad90ae3c..c8566bfc07a9 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -101,10 +101,11 @@ python3Packages.buildPythonApplication { ./hplip-3.20.11-nixos-cups-ppd-search-path.patch ]; - prePatch = '' + postPatch = '' # https://github.com/NixOS/nixpkgs/issues/44230 substituteInPlace createPPD.sh \ - --replace ppdc "${cups}/bin/ppdc" + --replace ppdc "${cups}/bin/ppdc" \ + --replace "gzip -c" "gzip -cn" # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ @@ -153,6 +154,12 @@ python3Packages.buildPythonApplication { export CUPS_DATADIR="${cups}/share/cups" ''; + postConfigure = '' + # don't save timestamp, in order to improve reproducibility + substituteInPlace Makefile \ + --replace "GZIP_ENV = --best" "GZIP_ENV = --best -n" + ''; + enableParallelBuilding = true; # From 83e44f67b1a05c65fad8fc55a54268cc06ecf3f7 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 7 Jul 2021 22:35:28 +0200 Subject: [PATCH 53/71] dwm: support cross-compilation by setting proper CC --- pkgs/applications/window-managers/dwm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 088581b67013..6235c93a2816 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + meta = with lib; { homepage = "https://dwm.suckless.org/"; description = "An extremely fast, small, and dynamic window manager for X"; From e93d6ab0ff3f9999c58cea3c6e4f3554c9b221ef Mon Sep 17 00:00:00 2001 From: Sandro Date: Wed, 7 Jul 2021 23:21:12 +0200 Subject: [PATCH 54/71] mdbook: remove unused input --- pkgs/tools/text/mdbook/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index a8c5efb0a493..b43e8e52bad0 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, darwin }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices }: rustPlatform.buildRustPackage rec { pname = "mdbook"; From 22a78740241d8c35bf8c43c4731bc5b84386b5ea Mon Sep 17 00:00:00 2001 From: Lara Date: Wed, 7 Jul 2021 21:10:53 +0000 Subject: [PATCH 55/71] nixos/doc: Fix synopsis for nixos-rebuild(8) --- nixos/doc/manual/man-nixos-rebuild.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml index 2e1069828c1b..8c34ea7458e6 100644 --- a/nixos/doc/manual/man-nixos-rebuild.xml +++ b/nixos/doc/manual/man-nixos-rebuild.xml @@ -108,7 +108,23 @@ name + + + + host + + + + host + + + + + + + + From be80d6208a604a28ce4c213a280e443c2f2e7ddc Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Wed, 7 Jul 2021 09:37:48 -0400 Subject: [PATCH 56/71] pulseeffects,easyeffects: 5.0.3 -> 6.0.0 New release, the main feature is updating to GTK4 and significant updates to the internal processing pipelines. Many dependencies no longer seem to be required, I have manually checked that mentioned plugins are still available. --- .../from_md/release-notes/rl-2111.section.xml | 7 + .../manual/release-notes/rl-2111.section.md | 2 + .../audio/easyeffects/default.nix | 85 ++++++++++++ .../audio/pulseeffects/default.nix | 127 ------------------ pkgs/top-level/aliases.nix | 3 +- pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 98 insertions(+), 130 deletions(-) create mode 100644 pkgs/applications/audio/easyeffects/default.nix delete mode 100644 pkgs/applications/audio/pulseeffects/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a95b1dd66b96..7d046d39de75 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -342,6 +342,13 @@ release instead of the old 2.7.7 version. + + + The pulseeffects package updated to + version + 4.x and renamed to easyeffects. + + The libwnck package now defaults to the 3.x diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index be46591dfa16..96854ffdd745 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -84,6 +84,8 @@ In addition to numerous new and upgraded packages, this release has the followin * The `antlr` package now defaults to the 4.x release instead of the old 2.7.7 version. +* The `pulseeffects` package updated to [version 4.x](https://github.com/wwmm/easyeffects/releases/tag/v6.0.0) and renamed to `easyeffects`. + * The `libwnck` package now defaults to the 3.x release instead of the old 2.31.0 version. diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix new file mode 100644 index 000000000000..9bbbaf22f429 --- /dev/null +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -0,0 +1,85 @@ +{ lib, stdenv +, desktop-file-utils +, fetchFromGitHub +, fftwFloat +, glib +, glibmm +, gtk4 +, gtkmm4 +, itstool +, libbs2b +, libebur128 +, libsamplerate +, libsndfile +, lilv +, lv2 +, meson +, ninja +, nlohmann_json +, pipewire +, pkg-config +, python3 +, rnnoise +, rubberband +, speexdsp +, wrapGAppsHook +, zita-convolver +}: + +stdenv.mkDerivation rec { + pname = "easyeffects"; + version = "6.0.0"; + + src = fetchFromGitHub { + owner = "wwmm"; + repo = "easyeffects"; + rev = "v${version}"; + hash = "sha256:1m3jamnhgpx3z51nfc8xg7adhf5x7dirvw0wf129hzxx4fjl7rch"; + }; + + nativeBuildInputs = [ + desktop-file-utils + itstool + meson + ninja + pkg-config + python3 + wrapGAppsHook + ]; + + buildInputs = [ + fftwFloat + glib + glibmm + gtk4 + gtkmm4 + libbs2b + libebur128 + libsamplerate + libsndfile + lilv + lv2 + nlohmann_json + pipewire + rnnoise + rubberband + speexdsp + zita-convolver + ]; + + postPatch = '' + chmod +x meson_post_install.py + patchShebangs meson_post_install.py + ''; + + separateDebugInfo = true; + + meta = with lib; { + description = "Audio effects for PipeWire applications."; + homepage = "https://github.com/wwmm/easyeffects"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.linux; + badPlatforms = [ "aarch64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix deleted file mode 100644 index 7a7c7175a45d..000000000000 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, pkg-config -, itstool -, python3 -, libxml2 -, desktop-file-utils -, wrapGAppsHook -, gst_all_1 -, pipewire -, gtk3 -, glib -, glibmm -, gtkmm3 -, lilv -, lv2 -, serd -, sord -, sratom -, libbs2b -, libsamplerate -, libsndfile -, libebur128 -, rnnoise -, boost -, dbus -, fftwFloat -, calf -, zita-convolver -, zam-plugins -, rubberband -, lsp-plugins -}: - -let - lv2Plugins = [ - calf # limiter, compressor exciter, bass enhancer and others - lsp-plugins # delay - ]; - ladspaPlugins = [ - rubberband # pitch shifting - zam-plugins # maximizer - ]; -in stdenv.mkDerivation rec { - pname = "pulseeffects"; - version = "5.0.3"; - - src = fetchFromGitHub { - owner = "wwmm"; - repo = "pulseeffects"; - rev = "v${version}"; - sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx"; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - libxml2 - itstool - python3 - desktop-file-utils - wrapGAppsHook - ]; - - buildInputs = [ - pipewire - glib - glibmm - gtk3 - gtkmm3 - gst_all_1.gstreamer - gst_all_1.gst-plugins-base # gst-fft - gst_all_1.gst-plugins-good # spectrum plugin - gst_all_1.gst-plugins-bad - lilv lv2 serd sord sratom - libbs2b - libebur128 - libsamplerate - libsndfile - rnnoise - boost - dbus - fftwFloat - zita-convolver - ]; - - patches = [ - (fetchpatch { - # Fix build failure. - # https://github.com/wwmm/pulseeffects/pull/934 - url = "https://github.com/wwmm/pulseeffects/commit/ab7354a6850d23840b4c9af212dbebf4f31a562f.patch"; - sha256 = "1hd05xn6sp0xs632mqgwk19hl40kh2f69mx5mgzahysrj057w22c"; - }) - ]; - - postPatch = '' - chmod +x meson_post_install.py - patchShebangs meson_post_install.py - ''; - - preFixup = '' - gappsWrapperArgs+=( - --set LV2_PATH "${lib.makeSearchPath "lib/lv2" lv2Plugins}" - --set LADSPA_PATH "${lib.makeSearchPath "lib/ladspa" ladspaPlugins}" - ) - ''; - - # Meson is no longer able to pick up Boost automatically. - # https://github.com/NixOS/nixpkgs/issues/86131 - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - - separateDebugInfo = true; - - meta = with lib; { - description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; - homepage = "https://github.com/wwmm/pulseeffects"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d36f7e9719db..0df082ff35cb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -653,7 +653,8 @@ mapAliases ({ pyo3-pack = maturin; pmenu = throw "pmenu has been removed from nixpkgs, as its maintainer is no longer interested in the package."; # added 2019-12-10 pulseaudioLight = pulseaudio; # added 2018-04-25 - pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and pulseeffects-pw if you use PipeWire."; # added 2021-02-13, move back once we default to PipeWire audio server. + pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire."; # added 2021-02-13 + pulseeffects-pw = easyeffects; # added 2021-07-07 phonon-backend-gstreamer = throw "phonon-backend-gstreamer: Please use libsForQt5.phonon-backend-gstreamer, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon-backend-vlc = throw "phonon-backend-vlc: Please use libsForQt5.phonon-backend-vlc, as Qt4 support in this package has been removed."; # added 2019-11-22 phonon = throw "phonon: Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0b60596998..bc5d83614af2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19749,8 +19749,8 @@ in libpulseaudio = libpulseaudio-vanilla; - pulseeffects-pw = callPackage ../applications/audio/pulseeffects { - boost = boost172; + easyeffects = callPackage ../applications/audio/easyeffects { + glibmm = glibmm_2_68; }; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { From aa359bdfde3d0d4eceb9161639be761edbeac086 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 8 Jul 2021 00:12:15 +0200 Subject: [PATCH 57/71] electrs: 0.8.9 -> 0.8.10 --- pkgs/applications/blockchains/electrs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix index af0346196a32..cf2f4d3d47eb 100644 --- a/pkgs/applications/blockchains/electrs.nix +++ b/pkgs/applications/blockchains/electrs.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "01fli2k5yh4iwlds97p5c36q19s3zxrqhkzp9dsjbgsf7sv35r3y"; + sha256 = "0q7mvpflnzzm88jbsdxgvhk9jr5mvn23hhj2iwy2grnfngxsmz3y"; }; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "1rqpadlr9r4z2z825li6vi5a21hivc3bsn5ibxshrdrwiycyyxz8"; + cargoSha256 = "0i8npa840g4kz50n6x40z22x9apq8snw6xgjz4vn2kh67xc4c738"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; From 5ae0e01511be6c37135361365a32ffc3a82beb1f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Wed, 7 Jul 2021 23:12:54 +0200 Subject: [PATCH 58/71] fcft: support cross-compilation --- pkgs/development/libraries/fcft/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 3634b4a2cab1..c413cf277c8b 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { sha256 = "01zvc8519fcg14nmcx3iqap9jnspcnr6pvlr59ipqxs0jprnrxl2"; }; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ pkg-config meson ninja scdoc ]; buildInputs = [ freetype fontconfig pixman tllist ] ++ lib.optional withHarfBuzz harfbuzz; From 4bfe6ad113b64d10b557388ce769e2d0e9d88d9b Mon Sep 17 00:00:00 2001 From: Vanilla Date: Wed, 7 Jul 2021 17:55:06 +0800 Subject: [PATCH 59/71] gpick: init at 0.2.6 --- pkgs/tools/misc/gpick/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/gpick/default.nix diff --git a/pkgs/tools/misc/gpick/default.nix b/pkgs/tools/misc/gpick/default.nix new file mode 100644 index 000000000000..0d39bb810b93 --- /dev/null +++ b/pkgs/tools/misc/gpick/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, glib, boost, pkg-config, gtk3, ragel, lua, lib }: + +stdenv.mkDerivation rec { + pname = "gpick"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "thezbyg"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-Z67EJRtKJZLoTUtdMttVTLkzTV2F5rKZ96vaothLiFo="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + buildInputs = [ boost gtk3 ragel lua ]; + + meta = with lib; { + description = "Advanced color picker written in C++ using GTK+ toolkit"; + homepage = "http://www.gpick.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.vanilla ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be0b60596998..1277201d84a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -295,6 +295,8 @@ in glade = callPackage ../development/tools/glade { }; + gpick = callPackage ../tools/misc/gpick { }; + hobbes = callPackage ../development/tools/hobbes { }; html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; From b7dd636f2475cd199d12cce672390f998f8c81bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 8 Jul 2021 02:20:26 +0200 Subject: [PATCH 60/71] turbovnc: Fix that setting JAVA_HOME breaks vncviewer. Fixes #129582 --- pkgs/tools/admin/turbovnc/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index 33d248ffde88..c0af38e10f3b 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -95,10 +95,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/vncserver \ --prefix PATH : ${lib.makeBinPath (with xorg; [ xauth ])} - # The viewer is in Java and requires `JAVA_HOME`. + # The viewer is in Java and requires `JAVA_HOME` (which is a single + # path, cannot be multiple separated paths). # For SSH support, `ssh` is required on `PATH`. wrapProgram $out/bin/vncviewer \ - --prefix JAVA_HOME : "${lib.makeLibraryPath [ openjdk ]}/openjdk" \ + --set JAVA_HOME "${lib.makeLibraryPath [ openjdk ]}/openjdk" \ --prefix PATH : ${lib.makeBinPath [ openssh ]} ''; From 5d106ae351be371e258cf23e4a49364741883305 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 01:10:49 +0000 Subject: [PATCH 61/71] bitwarden: 1.27.0 -> 1.27.1 --- pkgs/tools/security/bitwarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 39756c9e9a78..e0bbad3486ca 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.27.0"; + x86_64-linux = "1.27.1"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-Ik+g7jkTBHRbGwDhbiJGQorMmt6GhCXVUd82Sug9a28="; + x86_64-linux = "sha256-CqyIARPHri018AOgI1rFJ9Td3K8OamXVgupAINME7BY="; }.${system} or ""; meta = with lib; { From e0d1e49f60a552f7da96435689f9d8b2f4338dc5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 02:05:35 +0000 Subject: [PATCH 62/71] cpp-utilities: 5.10.4 -> 5.10.5 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index de7bf560d3ea..fdf4b469059e 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.10.4"; + version = "5.10.5"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pZh/NbTzQR2kjMeauv1HcRn0hDBaCNRbaZ3+1qs5rxU="; + sha256 = "sha256-1GAZKMfA2cB/7/TZfV+WOvjlu0sWq1loOauX4EfHogA="; }; nativeBuildInputs = [ cmake ]; From 6226fc914382823647e6a45b6d404890fa870d1b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 02:31:16 +0000 Subject: [PATCH 63/71] dnsproxy: 0.38.1 -> 0.38.2 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index c28e94a8218c..96528a78d4cb 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-H0K38SX/mKsVjdQEa6vzx5TNRhqqomYk28+5Wl5H0sA="; + sha256 = "sha256-v2uVIFPc8h58W03Jo2vsbLT5f7F8bJw4uMtSErrBYdo="; }; vendorSha256 = null; From d1153f56b18fb868a6f4e8c32e0db6ba3365ee42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 02:48:25 +0000 Subject: [PATCH 64/71] efm-langserver: 0.0.31 -> 0.0.32 --- pkgs/development/tools/efm-langserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/efm-langserver/default.nix b/pkgs/development/tools/efm-langserver/default.nix index f42ae929af18..2984de4c5e17 100644 --- a/pkgs/development/tools/efm-langserver/default.nix +++ b/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.31"; + version = "0.0.32"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-4NdD+WwvlqfJdPqXTz9LUyriJyLPppi8jH6dxYupe6A="; + sha256 = "sha256-zjjzdHlWEDDmPaDPuyk1ZoXwEFBogf51KjOmRmhFAdc="; }; vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; From d0ecb1de68cde0853c01437155d079a0ff4627d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 03:06:26 +0000 Subject: [PATCH 65/71] esbuild: 0.12.14 -> 0.12.15 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 8b37899ef675..d3833d3b1473 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.14"; + version = "0.12.15"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-+qFR5XGV1LSCY8AR7gd269UcOwlL5hkvKiQEhdsqIJc="; + sha256 = "sha256-Ikt8kBkwI9AQrWp9j4Zaf+BqGVcyhyagBDjTGZm/dzQ="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From 0853f01c420aaafbfaa04474cf03cb471100da1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 03:15:52 +0000 Subject: [PATCH 66/71] exoscale-cli: 1.34.0 -> 1.35.1 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 7136fecf433a..477bac87b9af 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.34.0"; + version = "1.35.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Gu9o1aUDlhcEZPZZsfVF0FnlzT1DvbEXMXjnOxhY8tY="; + sha256 = "sha256-RF0ZLcQNBVEExzSaOBM9EbqP1wuY8yIWYV8uabyc40o="; }; goPackagePath = "github.com/exoscale/cli"; From 7eba638f8766137b2fc8b492e34d9ac56596075f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 04:30:13 +0000 Subject: [PATCH 67/71] goreleaser: 0.173.1 -> 0.173.2 --- pkgs/tools/misc/goreleaser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 34195c2fffe0..5e805920b68a 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.173.1"; + version = "0.173.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v3Sln1qtYDdWCWJSKErxUoPAUzwWrTYM0j5X+mz+1xo="; + sha256 = "sha256-X7Tj50A0CwkGUyKGsCj6LBAlNZwMhFk/gDEgG1KNjx0="; }; vendorSha256 = "sha256-yX8Ffdzq22JHA2owtHurH8AEgqPgPjz+N06oD5ZiZmM="; From c691caea0d4c6d6bfc921e8b5ad5f27bd2731f70 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 8 Jul 2021 04:49:18 +0000 Subject: [PATCH 68/71] gpg-tui: 0.6.2 -> 0.7.0 --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 063265e51d81..c04f885a91fd 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-Iv5A+o4TNSHJeTZgZ2e0SCHclz1mGMVRJDdBAWilyT8="; + sha256 = "sha256-WUD6KZdtMJ/nEbC5MStK8qWKK05lXuk8+VD741g448s="; }; - cargoSha256 = "sha256-ISG/0WtgWwZoQd8PsvaQ9L8UKwerzEhY/84DxkdZV2g="; + cargoSha256 = "sha256-uF9mbJ7Nd+JaoZN886NX8iRv8/LZSqYntoosyFzzAIs="; nativeBuildInputs = [ gpgme # for gpgme-config From 8e133fa1f5a5a118eee6042b2b33e1db2fb52d5b Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Wed, 7 Jul 2021 00:06:14 -0700 Subject: [PATCH 69/71] IPMIView: 2.18.0 -> 2.19.0 Bump the sha, and strip the 'amd64' directory since the new tarball doesn't seem to have that level of structure. --- pkgs/applications/misc/ipmiview/default.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 0c7fc750cfd5..92491f4508e7 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "IPMIView"; - version = "2.18.0"; - buildVersion = "201007"; + version = "2.19.0"; + buildVersion = "210401"; src = fetchurl { url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "10cv63yhh81gjxahsg4y3zp4mjivc217m4z1vcpwvvnds46c65h8"; + sha256 = "sha256-6hxOu/Wkcrp9MaMYlxOR2DZW21Wi3BIFZp3Vm8NRBWs="; }; nativeBuildInputs = [ patchelf makeWrapper ]; @@ -29,10 +29,14 @@ stdenv.mkDerivation rec { else throw "IPMIView is not supported on this platform"; in '' - patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so - patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so - patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java + runHook preBuild + + patchelf --set-rpath "${lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/libawt_xawt.so + patchelf --set-rpath "${lib.makeLibraryPath [ freetype ]}" ./jre/lib/libfontmanager.so + patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} + + runHook postBuild ''; desktopItem = makeDesktopItem rec { @@ -44,6 +48,8 @@ stdenv.mkDerivation rec { }; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp -R . $out/ @@ -61,6 +67,8 @@ stdenv.mkDerivation rec { mkdir -p $WORK_DIR ln -snf '$out'/iKVM.jar '$out'/iKVM_ssl.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR cd $WORK_DIR' + + runHook postInstall ''; meta = with lib; { From c39ef3098051240a340b55b6091c7e6d1920f131 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 8 Jul 2021 08:21:50 +0200 Subject: [PATCH 70/71] python3Packages.phonenumbers: 8.12.25 -> 8.12.26 --- .../python-modules/phonenumbers/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index a7ab39c7c1c9..fa869c5d75d9 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -1,18 +1,30 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.25"; + version = "8.12.26"; src = fetchPypi { inherit pname version; - sha256 = "de4db4e2582f989a9cbae54364a647b24a72a7b0126be50d8356cf02217dc6c9"; + sha256 = "sha256-Zbq269vg7FGWx0YmlJdI21M30jiVqrwe+PXXKEeHmYo="; }; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests/*.py" ]; + + pythonImportsCheck = [ "phonenumbers" ]; + meta = with lib; { - description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; - homepage = "https://github.com/daviddrysdale/python-phonenumbers"; - license = licenses.asl20; + description = "Python module for handling international phone numbers"; + homepage = "https://github.com/daviddrysdale/python-phonenumbers"; + license = licenses.asl20; maintainers = with maintainers; [ fadenb ]; }; } From bbd5cdac2995d66518a53e1e496c8bf29cc3260f Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Tue, 9 Mar 2021 21:51:32 +0100 Subject: [PATCH 71/71] nixos/oci-containers: enable login for registry --- .../modules/virtualisation/oci-containers.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index 65b63cebc79c..a4a92f22506c 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -31,6 +31,30 @@ let example = literalExample "pkgs.dockerTools.buildDockerImage {...};"; }; + login = { + + username = mkOption { + type = with types; nullOr str; + default = null; + description = "Username for login."; + }; + + passwordFile = mkOption { + type = with types; nullOr str; + default = null; + description = "Path to file containing password."; + example = "/etc/nixos/dockerhub-password.txt"; + }; + + registry = mkOption { + type = with types; nullOr str; + default = null; + description = "Registry where to login to."; + example = "https://docker.pkg.github.com"; + }; + + }; + cmd = mkOption { type = with types; listOf str; default = []; @@ -220,6 +244,8 @@ let }; }; + isValidLogin = login: login.username != null && login.passwordFile != null && login.registry != null; + mkService = name: container: let dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn; in { @@ -235,6 +261,13 @@ let preStart = '' ${cfg.backend} rm -f ${name} || true + ${optionalString (isValidLogin container.login) '' + cat ${container.login.passwordFile} | \ + ${cfg.backend} login \ + ${container.login.registry} \ + --username ${container.login.username} \ + --password-stdin + ''} ${optionalString (container.imageFile != null) '' ${cfg.backend} load -i ${container.imageFile} ''}