diff options
91 files changed, 542 insertions, 296 deletions
diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 1ae78a4fb8f8..5a7a23f9c789 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -1,8 +1,8 @@ name: "Update terraform-providers" on: - schedule: - - cron: "14 3 * * 0" + #schedule: + # - cron: "14 3 * * 0" workflow_dispatch: permissions: diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80b7e04371bc..9f3eae8e41ae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -373,6 +373,12 @@ githubId = 10677343; name = "Eugene"; }; + afh = { + email = "surryhill+nix@gmail.com"; + github = "afh"; + githubId = 16507; + name = "Alexis Hildebrandt"; + }; aflatter = { email = "flatter@fastmail.fm"; github = "aflatter"; @@ -2443,6 +2449,12 @@ githubId = 42220376; name = "Charlotte Van Petegem"; }; + ciferkey = { + name = "Matthew Brunelle"; + email = "ciferkey@gmail.com"; + github = "ciferkey"; + githubId = 101422; + }; cigrainger = { name = "Christopher Grainger"; email = "chris@amplified.ai"; @@ -3739,6 +3751,12 @@ github = "edlimerkaj"; githubId = 71988351; }; + ehllie = { + email = "me@ehllie.xyz"; + github = "ehllie"; + githubId = 20847625; + name = "Elizabeth Paź"; + }; elliottslaughter = { name = "Elliott Slaughter"; email = "elliottslaughter@gmail.com"; diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index 53929761b86c..788e06ffecf0 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -248,6 +248,8 @@ in "-/etc/localtime" "-/etc/kanidm" "-/etc/static/kanidm" + "-/etc/ssl" + "-/etc/static/ssl" ]; BindPaths = [ # To create the socket diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index 852dc53e75d3..7f8a4e501777 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -44,6 +44,12 @@ import ./make-test-python.nix ({ pkgs, ... }: enableClient = true; clientSettings = { uri = "https://${serverDomain}"; + verify_ca = true; + verify_hostnames = true; + }; + enablePam = true; + unixSettings = { + pam_allowed_login_groups = [ "shell" ]; }; }; @@ -67,9 +73,11 @@ import ./make-test-python.nix ({ pkgs, ... }: start_all() server.wait_for_unit("kanidm.service") server.wait_until_succeeds("curl -sf https://${serverDomain} | grep Kanidm") - server.wait_until_succeeds("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'") - client.wait_until_succeeds("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}") + server.succeed("ldapsearch -H ldap://[::1]:636 -b '${ldapBaseDN}' -x '(name=test)'") + client.succeed("kanidm login -D anonymous && kanidm self whoami | grep anonymous@${serverDomain}") rv, result = server.execute("kanidmd recover_account -c ${serverConfigFile} idm_admin 2>&1 | rg -o '[A-Za-z0-9]{48}'") assert rv == 0 + client.wait_for_unit("kanidm-unixd.service") + client.succeed("kanidm_unixd_status | grep working!") ''; }) diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix index 756a8d5de49a..698d67c793e3 100644 --- a/nixos/tests/matrix/synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -209,7 +209,7 @@ in { "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" ) serverpostgres.require_unit_state("postgresql.service") - serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} ") + serverpostgres.succeed("register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} https://localhost:8448/") serverpostgres.succeed("obtain-token-and-register-email") serversqlite.wait_for_unit("matrix-synapse.service") serversqlite.wait_until_succeeds( diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 3e7f2ddd4ad9..41e71cec2ff8 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "sonic-pi-net"; repo = pname; rev = "v${version}"; - hash = "sha256-kEZNVTAWkiqxyPJHSL4Gismpwxd+PnXiH8CgQCV3+PQ="; + hash = "sha256-VRuNhS53okKsCHgKEsJgkpIe9yXFY6d2ghd0nsUQLLM="; }; mixFodDeps = beamPackages.fetchMixDeps { diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index d9085ff734d8..73d338ec1493 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk="; + sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix index 80e1b7d115df..6430e56ef730 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -5,13 +5,13 @@ trivialBuild { pname = "bqn-mode"; - version = "0.pre+date=2022-01-07"; + version = "0.pre+date=2022-09-14"; src = fetchFromGitHub { owner = "museoa"; repo = "bqn-mode"; - rev = "86ef8b4d32d272b2765cd4a6e6e0b70a4f3e99a2"; - hash = "sha256-6ygV/iNzzpZ77w+Dh/snHAzUxrbfaU9TxuNOtJK6pNQ="; + rev = "3e3d4758c0054b35f047bf6d9e03b1bea425d013"; + hash = "sha256:0pz3m4jp4dn8bsmc9n51sxwdk6g52mxb6y6f6a4g4hggb35shy2a"; }; meta = with lib; { diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 34853b890417..5e455b6bcd9f 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -136,7 +136,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optional (withX && withGTK3) gtk3-x11 - ++ lib.optional withGTK3 gsettings-desktop-schemas + ++ lib.optional (!stdenv.isDarwin && withGTK3) gsettings-desktop-schemas ++ lib.optional withPgtk gtk3 ++ lib.optional (withX && withMotif) motif ++ lib.optional withSQLite3 sqlite diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5b473ef8c49c..c602ff209aef 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10628,6 +10628,18 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; + vim-nickel = buildVimPluginFrom2Nix { + pname = "vim-nickel"; + version = "2022-03-16"; + src = fetchFromGitHub { + owner = "nickel-lang"; + repo = "vim-nickel"; + rev = "2f0f5f8ce2a8e719a5e39d7210ca914ae403374c"; + sha256 = "1li3wc5164mcqrvj42dc8zh3j8wml10gpgffapnjilwa5c85kv3q"; + }; + meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; + }; + vim-ninja-feet = buildVimPluginFrom2Nix { pname = "vim-ninja-feet"; version = "2021-05-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 92910fdff010..8639d8a4af36 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -892,6 +892,7 @@ https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,, https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, +https://github.com/nickel-lang/vim-nickel/,main, https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, diff --git a/pkgs/applications/misc/debian-goodies/default.nix b/pkgs/applications/misc/debian-goodies/default.nix index 560afe32b8a1..897881dec46c 100644 --- a/pkgs/applications/misc/debian-goodies/default.nix +++ b/pkgs/applications/misc/debian-goodies/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "debian-goodies"; - version = "0.88"; + version = "0.88.1"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debian-goodies"; rev = "debian/${version}"; - sha256 = "sha256-SDGWRGwRuryCJSWjuYB+Cg/Pl8q4VP4zcisUOn/GhJY="; + sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ="; }; postPatch = '' diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 13d8ee513e09..1ba4fde22f78 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-1nvkjucMRAwpqg2LI+1UrICMLzSd6t0yGnYdCUNQslU="; + sha256 = "sha256-FMGNaA/a1IzF2T0k9LGCOvLK26SlxX2cCOn7dLD/o7c="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 78c687457e05..64b39b2ddaeb 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "atmos"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SZ/4QKO8PdbHWZ+urOqZPFUb9lFRP+HWbNff1fmwDqI="; + sha256 = "sha256-Jt8/sB6cpxNr0Mcp0+KrwxQAicOHHRGnHXLruBSvZ4M="; }; vendorSha256 = "sha256-d2Eod1AK6Ei5Az9wPHVqij8K4CVj7Ptewd3dBJ9Wt3o="; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 5bcdf921bc3b..f6e5aa4952f8 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-/0CZFvCBesATVGGCJoiM3GfYvCrmDJBHMXhn/o8xhKg="; + sha256 = "sha256-U9U1r74E4ryc8zUb1EogfBT57kfsd89i7DWO05tnQw4="; }; vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg="; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 6b006a507b82..d50f004a84e5 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.23.10"; + version = "1.23.11"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-ujSy6akbk4SvMIQdBJkNMwaRNEfFKJmVrN3lNtFudkA="; + sha256 = "sha256-fjB5O3kuU09megWGgU7f3otmWD/a31xVV1Dap2+xFkw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 8ba5fa6b700b..17d6aeb8d866 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-MdKeczst9t7VOxTx4/cAfbEUFOCIS3jQRYJcCJ8AH0Q="; + sha256 = "sha256-XWqyeUBrM/ks6Y7tfVXcynuZp9Ied0B7AdtC/qGCBQA="; }; - vendorSha256 = "sha256-rYPkY6dH4DJ6uwckTbohlutXNnlQBMODPKntu5EVVTY="; + vendorSha256 = "sha256-BEKo67EgbCnX5B12Dkio0vkawAdCn+fA8eXn90EPm00="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 312bf72f5a5a..ebeed89fdf61 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , callPackage , config +, writeShellScript , cdrtools # libvirt }: @@ -47,7 +48,12 @@ let ''; # Keep the attributes around for later consumption - passthru = attrs; + passthru = attrs // { + updateScript = writeShellScript "update" '' + provider="$(basename ${provider-source-address})" + ./pkgs/applications/networking/cluster/terraform-providers/update-provider --no-build "$provider" + ''; + }; }); list = lib.importJSON ./providers.json; diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index d7a05cf24a65..288c2f345c2c 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p jq +#! nix-shell -i bash -p jq # shellcheck shell=bash # Update all providers which have specified provider source address diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-provider b/pkgs/applications/networking/cluster/terraform-providers/update-provider index 482da6a60275..f0fa979b98cb 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../../.. -i bash -p coreutils curl git jq moreutils nix nix-prefetch +#! nix-shell -i bash -p coreutils curl git jq moreutils nix nix-prefetch # shellcheck shell=bash # vim: ft=sh # @@ -100,6 +100,8 @@ echo_provider() { echo "== terraform-providers.${provider}: $* ==" } +pushd "$(dirname "$0")" + if [[ ${provider} =~ ^[^/]+/[^/]+$ ]]; then echo_provider "init" source_address=registry.terraform.io/${provider} @@ -164,3 +166,5 @@ if [[ ${build} == 1 ]]; then echo_provider "building" nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider}" fi + +popd diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 8ffe6f05f5df..1905fd1b4f36 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "profanity"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = version; - hash = "sha256-yUiiww8yhymdqR6CITRnItxZhfpZiEbu1WyD8bDW+vc="; + hash = "sha256-cTkNtj1mN5EuCyniFibKNzY2fxe3NKpRXt8acO/p6WY="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 0f1e9f9e8ad9..182fcc1e766b 100644 --- a/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.9.1"; + version = "1.10.0"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "sha256-Zc3btkvN4ic47IGigeFJGx4dwbM+b7iuIOxpmcWmrRQ="; + sha256 = "sha256-oqwEXwlxyoYBQpVp9SdV5q+GrM0N9TIfu01HHIm9mUw="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 49e2ca360d0c..8601abe5936d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.58.0"; # Please backport all updates to the stable channel. + version = "5.59.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-1UM68aDXM0MseQmOAVmX13yD/GLPCmq6wikt8CwEdgc="; + sha256 = "sha256-6im8OH1J+YlWCZ5eeJJbXokQPs6QbIzYIonGy9vbWvE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 552f685ffce8..4c87ce80505d 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.8.4"; + version = "22.9.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "cfb266b3a812b5f87e57d5002cd05000931baad9fefbf353b2caa05407dc79e5"; + sha256 = "sha256-PTaOExBWx7YTdVpDDSwnPu3vt12Yfh2/FW2xwnhB9WA="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index ae4b7ee36636..e492daaced37 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -1,9 +1,10 @@ { lib +, stdenv , callPackage , fetchFromGitHub , cmake -, llvmPackages_11 , clang +, llvm , python3 , zlib , z3 @@ -35,18 +36,14 @@ }: let - # Python used for KLEE tests. kleePython = python3.withPackages (ps: with ps; [ tabulate ]); # The klee-uclibc derivation. kleeuClibc = callPackage ./klee-uclibc.nix { - inherit clang llvmPackages_11 extraKleeuClibcConfig debugRuntime runtimeAsserts; + inherit stdenv clang llvm extraKleeuClibcConfig debugRuntime runtimeAsserts; }; - -in -clang.stdenv.mkDerivation rec { - +in stdenv.mkDerivation rec { pname = "klee"; version = "2.3"; @@ -61,7 +58,7 @@ clang.stdenv.mkDerivation rec { cryptominisat gperftools lit # Configure phase checking for lit - llvmPackages_11.llvm + llvm sqlite stp z3 diff --git a/pkgs/applications/science/logic/klee/klee-uclibc.nix b/pkgs/applications/science/logic/klee/klee-uclibc.nix index a794fe2eee8a..91086ae84627 100644 --- a/pkgs/applications/science/logic/klee/klee-uclibc.nix +++ b/pkgs/applications/science/logic/klee/klee-uclibc.nix @@ -1,10 +1,11 @@ { lib +, stdenv , fetchurl , fetchFromGitHub , which , linuxHeaders , clang -, llvmPackages_11 +, llvm , python3 , curl , debugRuntime ? true @@ -23,8 +24,7 @@ let "RUNTIME_PREFIX" = "/"; "DEVEL_PREFIX" = "/"; }); -in -clang.stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "klee-uclibc"; version = "1.3"; src = fetchFromGitHub { @@ -37,7 +37,7 @@ clang.stdenv.mkDerivation rec { nativeBuildInputs = [ clang curl - llvmPackages_11.llvm + llvm python3 which ]; diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index 739064bb6169..54aa22511742 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -13,6 +13,7 @@ let configAwkScript = runCommand "why3-conf.awk" { inherit provers; } in stdenv.mkDerivation { pname = "${why3.pname}-with-provers"; + version = why3.version; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ why3 ] ++ provers; diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index 14827119f237..a74fe8b098c3 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.75"; + version = "0.75.1"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-s1MkiTya771r9JYCpsm7nW4gZwr/PJc0/v6tAgW7nLI="; + sha256 = "sha256-GlEXB89fZPRZAwvUUHcyKCH3Jj5AOvMSHFodsVKepSQ="; }; nativeBuildInputs = [ pkg-config bison ]; @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://gameoftrees.org"; license = licenses.isc; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe afh ]; }; } diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 2b765a6b4c3a..61c1e025afe7 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.25.1"; + version = "1.25.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IIgFnDPgeQrsleIzzFr4Q0Kz8bCzs0gFluFw+9Dub7I="; + sha256 = "sha256-a/p4lljxf+9vpd0LlBVXY4y4rfxH5vaoIj0EKaRa2zQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 179db58572d0..f79928f46291 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.10.2"; + version = "2.11.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-CxwNnSwF3QD86lzDgSlGZiEv2tMOfDTUGHOZVtsmY94="; + sha256 = "sha256-BMSLs12fPY8wat0rKys/7OI7F3GGNmQC+XRi6C4kYk4="; }; - vendorSha256 = "sha256-Yz2lea+ttgNbfP1mL+kwTKmo81Q6GGjJyvDANzeckpo="; + vendorSha256 = "sha256-aD0h7vSUkxaGBeN2S2GOEwKpXHKyvnwbOB7pABgBmCY="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 3bb12836a032..1a6d80220e21 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -3,15 +3,15 @@ stdenv.mkDerivation rec { pname = "lkl"; - version = "2019-10-04"; + version = "2022-05-18"; outputs = [ "dev" "lib" "out" ]; src = fetchFromGitHub { owner = "lkl"; repo = "linux"; - rev = "06ca3ddb74dc5b84fa54fa1746737f2df502e047"; - sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62"; + rev = "10c7b5dee8c424cc2ab754e519ecb73350283ff9"; + sha256 = "sha256-D3HQdKzhB172L62a+8884bNhcv7vm/c941wzbYtbf4I="; }; nativeBuildInputs = [ bc bison flex python3 ]; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { # Fix a /usr/bin/env reference in here that breaks sandboxed builds patchShebangs arch/lkl/scripts + patchShebangs scripts/ld-version.sh + # Fixup build with newer Linux headers: https://github.com/lkl/linux/pull/484 sed '1i#include <linux/sockios.h>' -i tools/lkl/lib/hijack/xlate.c ''; diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 3b7e4c4a4b04..f4392408c9e6 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -26,7 +26,7 @@ }: let pname = "gamescope"; - version = "3.11.43"; + version = "3.11.45-2"; in stdenv.mkDerivation { inherit pname version; @@ -35,7 +35,7 @@ stdenv.mkDerivation { owner = "Plagman"; repo = "gamescope"; rev = "refs/tags/${version}"; - hash = "sha256-XxOVM7xWeE2pF4U34jLvil5+vj+jePHPWHIfw0e/mnM="; + hash = "sha256-OLPwUELahqzmOBPvJg8pm556RH+H6TzRD9PHLnM2Ruc="; }; patches = [ ./use-pkgconfig.patch ]; diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix new file mode 100644 index 000000000000..f88c11388c79 --- /dev/null +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -0,0 +1,45 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, sassc +}: + +stdenvNoCC.mkDerivation rec { + pname = "adw-gtk3"; + version = "3.7"; + + src = fetchFromGitHub { + owner = "lassekongo83"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hHmNRPUJOXa//aKgAYhGBVX6usRsObWbzcfOa1uwbqM="; + }; + + nativeBuildInputs = [ + meson + ninja + sassc + ]; + + postPatch = '' + chmod +x gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + patchShebangs gtk/src/adw-gtk3-dark/gtk-3.0/install-dark-theme.sh + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "The theme from libadwaita ported to GTK-3"; + homepage = "https://github.com/lassekongo83/adw-gtk3"; + license = licenses.lgpl21Only; + platforms = platforms.linux; + maintainers = with maintainers; [ ciferkey ]; + }; +} diff --git a/pkgs/development/compilers/ante/default.nix b/pkgs/development/compilers/ante/default.nix new file mode 100644 index 000000000000..7730c594204d --- /dev/null +++ b/pkgs/development/compilers/ante/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, lib +, libffi +, libxml2 +, llvmPackages_13 +, ncurses +, rustPlatform +}: + +rustPlatform.buildRustPackage { + pname = "ante"; + version = "unstable-2022-08-22"; + src = fetchFromGitHub { + owner = "jfecher"; + repo = "ante"; + rev = "8b708d549c213c34e4ca62d31cf0dd25bfa7b548"; + sha256 = "sha256-s8nDuG32lI4pBLsOzgfyUGpc7/r0j4EhzH54ErBK7A0="; + }; + cargoSha256 = "sha256-29D7kPG7vop9lIxWQnaHkCTRY8YsCjERRCOvbU7oemQ="; + + /* + https://crates.io/crates/llvm-sys#llvm-compatibility + llvm-sys requires a specific version of llvmPackages, + that is not the same as the one included by default with rustPlatform. + */ + nativeBuildInputs = [ llvmPackages_13.llvm ]; + buildInputs = [ libffi libxml2 ncurses ]; + + postPatch = '' + substituteInPlace tests/golden_tests.rs --replace \ + 'target/debug' "target/$(rustc -vV | sed -n 's|host: ||p')/release" + ''; + preBuild = + let + major = lib.versions.major llvmPackages_13.llvm.version; + minor = lib.versions.minor llvmPackages_13.llvm.version; + llvm-sys-ver = "${major}${builtins.substring 0 1 minor}"; + in + '' + # On some architectures llvm-sys is not using the package listed inside nativeBuildInputs + export LLVM_SYS_${llvm-sys-ver}_PREFIX=${llvmPackages_13.llvm.dev} + export ANTE_STDLIB_DIR=$out/lib + mkdir -p $ANTE_STDLIB_DIR + cp -r $src/stdlib/* $ANTE_STDLIB_DIR + ''; + + meta = with lib; { + homepage = "https://antelang.org/"; + description = "A low-level functional language for exploring refinement types, lifetime inference, and algebraic effects"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ehllie ]; + }; +} diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 21d1f8494649..07c917473cc4 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.0.1"; - vc_version = "22070801"; + base_version = "8.0.3"; + vc_version = "22090809"; version = "${base_version}.${vc_version}"; src = fetchFromGitHub { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-rwRykovY8vv+boQiaSjCBoGxGpT1dF3qdEyxkykrKyk="; + sha256 = "sha256-0/wkUk7PMPbBSGzDuSd82yxRzvAYxkbEhM5LTVt4bMA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6277ec4f87e3..2eea7e2c0e9b 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.2.3"; + version = "11.2.4"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-TC6XzmBwf8HzSPRPevDLbSRm0KrQ0OpL9dXcGA5sukE="; + sha256 = "sha256-3EyRlUqxFJC/ZNLfzFSoAvFDk8dWqNVFrBVe7v+n/ZM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 50a9bf62c54b..9394eab133be 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; + meta = with lib; { homepage = "https://github.com/recp/cglm"; description = "Highly Optimized Graphics Math (glm) for C"; diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 1e0b6ac789bf..d895574d527d 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-SsT9CotWK3Ib/9D0aunwbCtaMRRAdYGXi+h1qdZRZCo="; + sha256 = "sha256-uE/b+8hJzk/fCEuyi1jlRjsbS2zI8gDcd7QfhUXVMp0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 7c7987478b80..7962e2111039 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper , runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv -, zimg, libass, python3, libiconv +, zimg, libass, python3, libiconv, testers , ApplicationServices }: @@ -38,6 +38,12 @@ stdenv.mkDerivation rec { inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand vapoursynth makeWrapper withPlugins; }; + + tests.version = testers.testVersion { + package = vapoursynth; + # Check Core version to prevent false positive with API version + version = "Core R${version}"; + }; }; postInstall = '' @@ -56,5 +62,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.x86_64; maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; + mainProgram = "vspipe"; }; } diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 95df3c97747f..064893a3dbcd 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -42,6 +42,7 @@ runCommand "${vapoursynth.name}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; passthru = { inherit python3; + inherit (vapoursynth) src version; withPlugins = plugins': withPlugins (plugins ++ plugins'); }; } '' diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index c942972597ad..5b67c9ac4340 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -1,23 +1,21 @@ -{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config +{ lib, fetchurl, buildDunePackage, ounit2, cstruct, dune-configurator, eqaf, pkg-config , withFreestanding ? false , ocaml-freestanding }: buildDunePackage rec { - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.5"; + version = "0.10.7"; src = fetchurl { - url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "sha256-eeKMSRZrBiTzWLv80P5LeouPib24uTigk2HLtORKpJU="; + url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; + sha256 = "sha256-PoGKdgwjXFtoTHtrQ7HN0qfdBOAQW2gNUk+DbrmIppw="; }; - useDune2 = true; - doCheck = true; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index 5506243ec3a4..098b587f3d59 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -21,10 +21,8 @@ buildDunePackage rec { pname = "mirage-crypto-ec"; inherit (mirage-crypto) - minimumOCamlVersion src - version - useDune2; + version; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 9a2b9c98e458..0793bf5c4f39 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -1,10 +1,10 @@ -{ buildDunePackage, ounit, randomconv, mirage-crypto, mirage-crypto-rng +{ buildDunePackage, ounit2, randomconv, mirage-crypto, mirage-crypto-rng , cstruct, sexplib0, zarith, eqaf, gmp }: buildDunePackage rec { pname = "mirage-crypto-pk"; - inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src; buildInputs = [ gmp ]; propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng @@ -13,7 +13,7 @@ buildDunePackage rec { strictDeps = !doCheck; doCheck = true; - checkInputs = [ ounit randomconv ]; + checkInputs = [ ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix index 91da7aa56816..5752507f9ef9 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -6,7 +6,7 @@ buildDunePackage { pname = "mirage-crypto-rng-async"; - inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; + inherit (mirage-crypto) version src; buildInputs = [ dune-configurator diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 8d67ade9b465..bf940c3eb70c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "mirage-crypto-rng-mirage"; - inherit (mirage-crypto-rng) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto-rng) version src; doCheck = true; checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 2281f10580cd..8900dd611d89 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -1,13 +1,13 @@ -{ buildDunePackage, mirage-crypto, ounit, randomconv, dune-configurator +{ buildDunePackage, mirage-crypto, ounit2, randomconv, dune-configurator , cstruct, duration, logs, mtime, ocaml_lwt }: buildDunePackage rec { pname = "mirage-crypto-rng"; - inherit (mirage-crypto) version src useDune2 minimumOCamlVersion; + inherit (mirage-crypto) version src; doCheck = true; - checkInputs = [ ounit randomconv ]; + checkInputs = [ ounit2 randomconv ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 68ee12f12c9d..3663e4b9cb71 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -1,15 +1,15 @@ -{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime, io-page }: +{ lib, buildDunePackage, fetchurl, lwt, duration, mirage-runtime }: buildDunePackage rec { pname = "mirage-unix"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "sha256-9ymVBb3dkhb+MN97/sXe/oQ36CVx0kruj3sd19LiFZ4="; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; }; - propagatedBuildInputs = [ lwt duration mirage-runtime io-page ]; + propagatedBuildInputs = [ lwt duration mirage-runtime ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index 92a184f4ea03..119414907856 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp +{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp , perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny }: buildPerlPackage rec { @@ -9,7 +9,7 @@ buildPerlPackage rec { sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b"; }; nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; - propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ]; LC_ALL = "en_US.UTF-8"; @@ -19,6 +19,14 @@ buildPerlPackage rec { export PERL_MB_OPT="--install_base=$out --prefix=$out" ''; buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build"; + + # Disabling tests on musl + # Void linux package have investigated the failure and tracked it down to differences in gettext behavior. They decided to disable tests. + # https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880 + # Alpine packagers have not worried about running the tests until now: + # https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 + doCheck = !stdenv.hostPlatform.isMusl; + checkPhase = '' export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat ./Build test diff --git a/pkgs/development/python-modules/diagrams/default.nix b/pkgs/development/python-modules/diagrams/default.nix index 4c00657df14c..49fd55545178 100644 --- a/pkgs/development/python-modules/diagrams/default.nix +++ b/pkgs/development/python-modules/diagrams/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "diagrams"; - version = "0.21.1"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mingrammer"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-YoXV5ikkBCSVyGmzEqp+7JLy82d7z9sbwS+U/EN3BFk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-LUuClvBJeOxtrg+S+lYLpP7T1RXCy5dNjFYQO3H54QE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 791edcb2fb20..c749071bab9b 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , isPy27 , fetchPypi +, fetchpatch , pikepdf , pillow , stdenv @@ -26,6 +27,14 @@ buildPythonPackage rec { sha256 = "8ec898a9646523fd3862b154f3f47cd52609c24cc3e2dc1fb5f0168f0cbe793c"; }; + patches = [ + (fetchpatch { + # https://gitlab.mister-muffin.de/josch/img2pdf/issues/148 + url = "https://gitlab.mister-muffin.de/josch/img2pdf/commit/57d7e07e6badb252c12015388b58fcb5285d3158.patch"; + hash = "sha256-H/g55spe/oVJRxO2Vh+F+ZgR6aLoRUrNeu5WnuU7k/k="; + }) + ]; + propagatedBuildInputs = [ pikepdf pillow diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 1e30869402cc..1ef91e080fe1 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - sha256 = "sha256-/PCw2sF3CxiBXV7WZcTl6NAs+v++od4Fs6uYFUhJMH8="; + sha256 = "sha256-BpETor1dz8qdMM8iYijlthnsrPF0FS8b1FDvuXxFB9s="; }; # force rebuild of headers needed for install diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index 806c12c0e4ff..b07ad237db2e 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "1.9.3"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "typeddjango"; repo = pname; - rev = version; - sha256 = "sha256-4hG3atahb+dH2dRGAxguJW3vvEf0TUGUJ3G5ymrf3Vg="; + rev = "refs/tags/${version}"; + sha256 = "sha256-QvUh/vIvzCfEYNC0Y388qavGvbTg0yuT4j0SttUpUWs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix new file mode 100644 index 000000000000..52877881296a --- /dev/null +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-colorama"; + version = "0.4.15"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-/RKLHjLz/s7F8J30Nm0hSY7obqMfz4tOjxrebQu/mDI="; + }; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Typing stubs for colorama"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ultraheat-api/default.nix b/pkgs/development/python-modules/ultraheat-api/default.nix index 71ebda7f79f0..98dd8de8fe73 100644 --- a/pkgs/development/python-modules/ultraheat-api/default.nix +++ b/pkgs/development/python-modules/ultraheat-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ultraheat-api"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ultraheat_api"; inherit version; - hash = "sha256-UzDGkLvFqqiBuiCgMA0BItmUhrY0b963o05WDHxsS0Q="; + hash = "sha256-sdZweq5TDl54UKHqQ0zlFQq0h+piisMKs2P/3E2vqX8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vapoursynth/default.nix b/pkgs/development/python-modules/vapoursynth/default.nix index ec88f244aee6..3a72e5c2d9d0 100644 --- a/pkgs/development/python-modules/vapoursynth/default.nix +++ b/pkgs/development/python-modules/vapoursynth/default.nix @@ -1,4 +1,4 @@ -{ vapoursynth, cython, buildPythonPackage, unittestCheckHook }: +{ vapoursynth, cython, buildPythonPackage, unittestCheckHook, python }: buildPythonPackage { pname = "vapoursynth"; @@ -19,6 +19,13 @@ buildPythonPackage { unittestFlagsArray = [ "-s" "$src/test" "-p" "'*test.py'" ]; + passthru = { + withPlugins = plugins: + python.pkgs.vapoursynth.override { + vapoursynth = vapoursynth.withPlugins plugins; + }; + }; + inherit (vapoursynth) meta; } diff --git a/pkgs/development/python-modules/vulcan-api/default.nix b/pkgs/development/python-modules/vulcan-api/default.nix index a9a07d738d27..bde97b8e1245 100644 --- a/pkgs/development/python-modules/vulcan-api/default.nix +++ b/pkgs/development/python-modules/vulcan-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "vulcan-api"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "kapi2289"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-decp3wq/O4QTBE40iSkMaCTJYM6XPP7nLlSAEL1bemY="; + sha256 = "sha256-0V1skTJdiL04jVKsMb0Kysbw36bQ3EAJG3YT7ik36zQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/winsspi/default.nix b/pkgs/development/python-modules/winsspi/default.nix index 6869c9f0b08a..d15ce8e261b5 100644 --- a/pkgs/development/python-modules/winsspi/default.nix +++ b/pkgs/development/python-modules/winsspi/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "winsspi"; - version = "0.0.10"; + version = "0.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L1qNLEufRZFEQmkJ4mp05VBRLiO2z5r1LCoAADx8P9s="; + hash = "sha256-AXC6SJ+iWPGqTmdgoWKEbD8tDUUcg2aD609hO2bdQfM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/beautysh/default.nix b/pkgs/development/tools/beautysh/default.nix new file mode 100644 index 000000000000..f01857fc6086 --- /dev/null +++ b/pkgs/development/tools/beautysh/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "beautysh"; + version = "6.2.1"; + format = "pyproject"; + + + src = fetchFromGitHub { + owner = "lovesegfault"; + repo = pname; + rev = "v${version}"; + hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + colorama + setuptools + types-colorama + types-setuptools + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"' + ''; + + pythonImportsCheck = [ + "beautysh" + ]; + + meta = with lib; { + description = "Tool for beautifying Bash scripts"; + homepage = "https://github.com/lovesegfault/beautysh"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 4df160fff301..60bda337d03f 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.85.0"; + version = "0.86.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hFL7ImtaQrNeoxNLE/RL79SHRBHSit1dQ6Wn8gq8dns="; + sha256 = "sha256-ilQNwxqi7PMj6zgJ7SbpKfHDiTEjfIey3jV/Owrbddc="; }; vendorSha256 = "sha256-GRCcKIUimPFdeAhnz6RC5arZ0E+z+SpaAC1uDaxpJkI="; diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 0b0b851e123f..7a7cafd92b72 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.2.33"; + version = "0.2.34"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-+NpoD6PwTd8s9cABnFApnnqrEb8UkhCxmj3FEE6sP9Q="; + sha256 = "sha256-gUdvndL8v+7lX/GuMxHlHxp3j8YTQWEh3c+WX+fDOQU="; }; - vendorSha256 = "sha256-t/tYN+Zxj3rxzb9QTTuPyjc4hdl+UjwPs+evAXbAByg="; + vendorSha256 = "sha256-yNb5OvsnNAk+K0gepKVuqivS+eeLMOVCqxF/rj+Rpps="; subPackages = [ "cmd/dagger" diff --git a/pkgs/development/tools/eclint/default.nix b/pkgs/development/tools/eclint/default.nix index ab60512198a3..b3ababc56d57 100644 --- a/pkgs/development/tools/eclint/default.nix +++ b/pkgs/development/tools/eclint/default.nix @@ -6,16 +6,18 @@ buildGoModule rec { pname = "eclint"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitLab { owner = "greut"; repo = pname; rev = "v${version}"; - sha256 = "sha256-inO41C/Ompyfy4CHPK4ksNU19KIcGyPgF/ptZC0GWXg="; + sha256 = "sha256-+ZbBmdCl1v4msFFA2kzL/IQTQtR39O5XYgCj7w+QGzE="; }; - vendorSha256 = "sha256-imVQnPoKOjed9XlikLWvudmlJklRrLFHKtNZoAmznZg="; + vendorSha256 = "sha256-CdvxY3uX6i3Xtg50jqlNr+VXpeOeg8M27huasbzA96M="; + + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { homepage = "https://gitlab.com/greut/eclint"; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index fa73ef702d91..81ad37d93914 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: buildGoModule rec { pname = "circleci-cli"; @@ -13,10 +13,20 @@ buildGoModule rec { vendorSha256 = "sha256-jrAd1G/NCjXfaJmzOhMjMZfJoGHsQ1bi3HudBM0e8rE="; + nativeBuildInputs = [ installShellFiles ]; + doCheck = false; ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; + postInstall = '' + mv $out/bin/circleci-cli $out/bin/circleci + + installShellCompletion --cmd circleci \ + --bash <(HOME=$TMPDIR $out/bin/circleci completion bash --skip-update-check) \ + --zsh <(HOME=$TMPDIR $out/bin/circleci completion zsh --skip-update-check) + ''; + meta = with lib; { # Box blurb edited from the AUR package circleci-cli description = '' @@ -24,6 +34,7 @@ buildGoModule rec { run jobs as if they were running on the hosted CirleCI application. ''; maintainers = with maintainers; [ synthetica ]; + mainProgram = "circleci"; license = licenses.mit; homepage = "https://circleci.com/"; }; diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 2eda19afd838..fd97d798c144 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZiRa4XYnY4fwbMenRLnvFQms66tIyGbm5saK8gN39ag="; + sha256 = "sha256-PyNO+kBxTYeqXgZh1XhE18G9ZK7suo/acKSE57zCbcY="; }; - cargoSha256 = "sha256-gWQbhFPdBDhPZY1LHxFlWO9xG4AXfyhZp0UnZ3Y86/Y="; + cargoSha256 = "sha256-i6AvKF34Gh3QhwvYVd+QTYCPMW9D0/vhz7WoY5d4kHU="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index d6868a74ccc3..996d48f23338 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.12"; + version = "1.0.13"; src = fetchCrate { inherit pname version; - sha256 = "sha256-v9nAiV3t/l6B+a7hzq4IYOetrNM5f22+nEIQncLs5tU="; + sha256 = "sha256-9w3/zQqcHtZ91WDolAru9aNG9pV8HuXvujvp3NlOcgU="; }; - cargoSha256 = "sha256-/PypVUT6n2pdsWIN+5EGHmj/UlfguvlbufBlHvuROg8="; + cargoSha256 = "sha256-CGP3KMJFDIl+MLzI9aQ2OM4tUuOQEtG4nET14zt7PD0="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration diff --git a/pkgs/development/tools/rust/probe-run/default.nix b/pkgs/development/tools/rust/probe-run/default.nix index dea5d4be52ff..4135a26d0f12 100644 --- a/pkgs/development/tools/rust/probe-run/default.nix +++ b/pkgs/development/tools/rust/probe-run/default.nix @@ -3,21 +3,21 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.3"; + version = "0.3.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-7o0aRiCxWoDoMysXIPyiBqH/8TtFo87im6Y0OFL0cTA="; + sha256 = "sha256-xVxigZET2/7xr+bb3r80F3y0yaNV1JeGeJ2EF0GWa1A="; }; - cargoSha256 = "sha256-vREz3FTZXMrc18LXIycJXX6SgW6IKGIgL/+79dMfNjk="; + cargoSha256 = "sha256-MK3F3Kt80Xdbbm68Jv1uh78nAj1LzJ90H54NYdn+Oms="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ libiconv AppKit IOKit ]; meta = with lib; { - description = "Run embedded programs just like native ones."; + description = "Run embedded programs just like native ones"; homepage = "https://github.com/knurling-rs/probe-run"; changelog = "https://github.com/knurling-rs/probe-run/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 8485904a66ca..26828ee7bb4c 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "vala-lint"; - version = "unstable-2022-05-20"; + version = "unstable-2022-09-14"; src = fetchFromGitHub { owner = "vala-lang"; repo = "vala-lint"; - rev = "b5c22b3bce25837565a894ba1a91bc856b60c251"; - sha256 = "sha256-DzK4CihXUOY3xnVnuCgfFmhN+Q3gUD/v77vA7hS9qWE="; + rev = "37660284fd1317a445ecddbaf1acdd6fa6bbbcad"; + sha256 = "sha256-Tbjw7BXeRuuF7VTo7FLYBR9+6mRp4AO2WhtE0GI3eYc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 0b1ce3de7580..8212c9a34b92 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "10.3.1"; + version = "10.8.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "sha256-LfvTnvOGFFZn7tUQ150fCO0gw7TK6JJj+Ys75VjJJ2M="; + sha256 = "sha256-QKzdK/3WGcNoPPgsCO08rmOFgwgYTI9yvP70HoGvojg="; }; # don't remove runtime deps @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast, easy and reliable testing for anything that runs in a browser"; homepage = "https://www.cypress.io"; + mainProgram = "Cypress"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index daadd1d8c32f..0d0ae17729fa 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.2.3"; + version = "5.2.4"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-kFlMC94+g9I7qzyaslU3RJ4jKtDHRZAei/yD1+8q2Hs="; + sha256 = "sha256-jtv14Y6TfiIHwbqqaX36j2H/4+UCikbpFhYgNeAP3L4="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 028799298d09..5dae4eee3832 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.19.7"; #zen - suffix = "zen2"; #zen - sha256 = "19hvjbw845g8jhfy6mhjizlkcq26si4mm9nchd3jl5mmbps4k2sp"; #zen + version = "5.19.8"; #zen + suffix = "zen1"; #zen + sha256 = "1jqzny85gl2wc029wp96v5x48wpn6nyx6zx9xrxqw0bhrlczzgq7"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.19.7"; #lqx - suffix = "lqx1"; #lqx - sha256 = "0zackpfnc4fmf9hvlcbmw9sdw3hag023k3ppy0iaakrfq44zqnis"; #lqx + version = "5.19.8"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1k1i9fqc0d5p2kp9bwdsp0ccbdfimavx4wpxv48mcnb7b93bpln2"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index b73c0ae04cdb..bef1fa6e33a6 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -67,6 +67,12 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) + + # fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream + (fetchurl { + url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6"; + sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0="; + }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 42af2054caf2..91770f4c6880 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -14,15 +14,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - sha256 = "sha256:0s5ji1iywymzxlv89y3ivl5vngkifhbpidpwxdrh969l3c5r4klf"; + sha256 = "sha256-+YcYrhUQMiLUcBnYhTHxf+NrmQIdYpeO/blMgU33w6o="; }; - vendorSha256 = "sha256:1p78nb7bryvs7p5iq6ihylflyjia60x4hd9c62ffwz37dwqlbi33"; + vendorSha256 = "sha256-Y8RFMW9nfO6cMCw1SDowKkpPHfUwGhzLPXr7vM6y6Nw="; ui = mkYarnPackage { inherit version; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index d28bba446a13..699c2e083b28 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.66.0"; + version = "1.67.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jrjNl3NlJ9sWNNM/VYrASPnVZ/U9fn1N1P6Yqd+MQ08="; + sha256 = "sha256-86KVu1wUkVy1/mONVbDM1g+Y+Kh90y1rpf58Kc2VtBY="; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 26b6ca78e1c3..c68262ba03fa 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.43.0"; + version = "2.44.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-swJzMZDBxof8RLMxVZN79zxajMO7kuxZxD8gNpgSksI="; + hash = "sha256-/vX7DVZNFuLNNQQDoiggBdp9dsjTAKZbhxD13+VUInU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index b39e565eadd8..057c2ecb9277 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "boulder"; - version = "2022-09-06"; + version = "2022-09-14"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -19,7 +19,7 @@ buildGoModule rec { git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT find "$out" -name .git -print0 | xargs -0 rm -rf ''; - hash = "sha256-BteHJAjIMPckbNIxgZCSSZV2iUc/yKVd0Px+S9ZwwUI="; + hash = "sha256-AviTVALFI1+0cFohLLdaKR1Lw3b9yURIIlrzweuiN7w="; }; vendorHash = null; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index 22a0d10b3c9f..a276aa3bd57a 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) (fetchNuGet { pname = "CliFx"; version = "2.3.0"; sha256 = "0dxxd5hm7gnc1lhq7k266nkcl84w0844r3cdxdcksvcc786f43vp"; }) diff --git a/pkgs/tools/filesystems/juicefs/default.nix b/pkgs/tools/filesystems/juicefs/default.nix new file mode 100644 index 000000000000..39268c3ed98e --- /dev/null +++ b/pkgs/tools/filesystems/juicefs/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +}: + +buildGoModule rec { + pname = "juicefs"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "juicedata"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-urhm2dnWIbzt1mSFDsmqJe61E6D6FWRUG6CJPy/ExOI="; + }; + + vendorSha256 = "sha256-LvF/6YA/OVO2cyBM1c3YYhEjT26SVXcsepn+vglRKmE="; + + ldflags = [ "-s" "-w" ]; + + doCheck = false; # requires network access + + # we dont need the libjfs binary + postFixup = '' + rm $out/bin/libjfs + ''; + + meta = with lib; { + description = "A distributed POSIX file system built on top of Redis and S3"; + homepage = "https://www.juicefs.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/tools/games/er-patcher/default.nix index 9d58f718e818..f5e7ddf7de16 100644 --- a/pkgs/tools/games/er-patcher/default.nix +++ b/pkgs/tools/games/er-patcher/default.nix @@ -6,13 +6,13 @@ runCommandLocal "er-patcher" rec { pname = "er-patcher"; - version = "1.06-1"; + version = "1.06-2"; src = fetchFromGitHub { owner = "gurrgur"; repo = "er-patcher"; rev = "v${version}"; - sha256 = "sha256-tjGvM+LNvHYX2VbVjwL404jpWWCzJ6j5jRPg/wib4e8="; + sha256 = "sha256-rFIuswn55FNVmBoDfIpG2cKxybNDaTwOeIUFFoncGF0="; }; buildInputs = [ diff --git a/pkgs/tools/misc/atuin/default.nix b/pkgs/tools/misc/atuin/default.nix index 770946721eb3..4ca131b0afce 100644 --- a/pkgs/tools/misc/atuin/default.nix +++ b/pkgs/tools/misc/atuin/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "0.10.0"; + version = "11.0.0"; src = fetchFromGitHub { owner = "ellie"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tBOJkAQCL2YGEJ3gJPxBC0swMuwOQENnhLXyms8WW6g"; + sha256 = "sha256-fHqZkFWueC2jr86kR3T1qcFaMMhEqfu2pzt8VfqmBnE="; }; - cargoSha256 = "sha256-P4jcJ6pl3ZGjiwNYfEjEiNVnE6mTDRUGl6gZW65Jn0I"; + cargoSha256 = "sha256-BkrrVlqEtQWjc+jaKilAtf9xyaENAuvqCxIrxxmglOY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/fsearch/default.nix b/pkgs/tools/misc/fsearch/default.nix index a7b95f3efa63..6af61b122337 100644 --- a/pkgs/tools/misc/fsearch/default.nix +++ b/pkgs/tools/misc/fsearch/default.nix @@ -2,26 +2,26 @@ , stdenv , fetchFromGitHub , gtk3 -, pcre +, pcre2 , glib , desktop-file-utils , meson , ninja , pkg-config , wrapGAppsHook -, unstableGitUpdater , gettext +, icu }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "fsearch"; - version = "unstable-2021-06-23"; + version = "0.2.2"; src = fetchFromGitHub { owner = "cboxdoerfer"; - repo = "fsearch"; - rev = "9300cc03ab2f0cea3a70abb5477bda8b52c4afd1"; - sha256 = "16qh2si48j113yhay5wawr7dvldks6jb32za41j2sng7n4ryw221"; + repo = pname; + rev = version; + hash = "sha256-1nu6J5eHVpPHGXcFKHSnUhAJccxABBht5H2bpBx42og="; }; nativeBuildInputs = [ @@ -36,7 +36,8 @@ stdenv.mkDerivation { buildInputs = [ glib gtk3 - pcre + pcre2 + icu ]; preFixup = '' @@ -44,10 +45,6 @@ stdenv.mkDerivation { --replace "Exec=fsearch" "Exec=$out/bin/fsearch" ''; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/cboxdoerfer/fsearch.git"; - }; - meta = with lib; { description = "A fast file search utility for Unix-like systems based on GTK+3"; homepage = "https://github.com/cboxdoerfer/fsearch.git"; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index c1db56b067a8..2779eda9d9eb 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.10.3"; + version = "0.10.5"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-MflcfTX0Ap8KEP0NDSZMHKM+fPsCoorUcUHV3WDXmBE="; - aarch64-linux = "sha256-WeSmRpi50dfnv5quLPQTYNKQcQlBwno1iwPUyTeJrW4="; - x86_64-darwin = "sha256-Ff4mu/g2K1wAeBj2IpOMT80gKcIP/dZjhWA8czokpxc="; - aarch64-darwin = "sha256-Ove3Tgj7FnR5ZTzVZlmFDRoUaVlO2xA6CzMqIdobZxQ="; + x86_64-linux = "sha256-lVv+mC9pNYzQes9k8KqkrHULuwETSHUCBF0FNw7kR+8="; + aarch64-linux = "sha256-0GVANhtzrAJUl4hktgiCdzUMhlhh7jyMAWS7/DyVuiU="; + x86_64-darwin = "sha256-N14Lynd/Q/eIGrM6ljAKnZdse/ShkvPaKSz6Q9DtYC0="; + aarch64-darwin = "sha256-iScNf6YM5nUjBqWMWb0eM5j9f3WiVvWOtjq7eoABfUM="; }; in fetchzip { diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index b4d420ea22da..2fbd7e88466b 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Command line client for Mega.co.nz"; homepage = "https://megatools.megous.com/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ viric AndersonTorres zowoq ]; + maintainers = with maintainers; [ viric AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix index 0988b9eb953b..8127ffe3310e 100644 --- a/pkgs/tools/security/faraday-cli/default.nix +++ b/pkgs/tools/security/faraday-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; - version = "2.1.6"; + version = "2.1.7"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ofL3tRYV2bwF+RYGoLpg/UQPg9HwrCepWAQxXiJkV2E="; + hash = "sha256-kZqJVJ6XrCC3iDSTJP8AmIs4WkxiAFimFIexl0L/HT0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/semgrep/common.nix b/pkgs/tools/security/semgrep/common.nix index 2c4a377efab6..a721448124e4 100644 --- a/pkgs/tools/security/semgrep/common.nix +++ b/pkgs/tools/security/semgrep/common.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, fetchzip, stdenv }: rec { - version = "0.108.0"; + version = "0.112.1"; src = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep"; rev = "v${version}"; - sha256 = "sha256-Vdrv7lVPsBsxkwwfviD5zRAdsD02RfWmM+IlaThduQs="; + sha256 = "sha256-SZtxZz4x6YUKw1uO5HQTU4lRY989SoCNsPQphJr+L0Y="; }; # submodule dependencies @@ -17,25 +17,25 @@ rec { langsSrc = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep-langs"; - rev = "98e4aacb0d58539b50a642a28d916a5d749e2a42"; - sha256 = "sha256-7w+8vLmzqBjbeV+a4Br7kLQ2bJv3aZJw8cB0R9d/D+E="; + rev = "91e288062eb794e8a5e6967d1009624237793491"; + sha256 = "sha256-z2t2bTRyj5zu9h/GBg2YeRFimpJsd3dA7dK8VBaKzHo="; }; interfacesSrc = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep-interfaces"; - rev = "bad298d06a5dc50e69b6818ba73f0cc9b9a17b58"; - sha256 = "sha256-AgNSvjVsP4b4zwkmq6BoNcOX3xdCSnQmXK+fVSkDXxQ="; + rev = "7bc457a32e088ef21adf1529fa0ddeea634b9131"; + sha256 = "sha256-xN8Qm1/YLa49k9fZKDoPPmHASI2ipI3mkKlwEK2ajO4="; }; # fetch pre-built semgrep-core since the ocaml build is complex and relies on # the opam package manager at some point coreRelease = if stdenv.isDarwin then fetchzip { url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}-osx.zip"; - sha256 = "sha256-f3ah4yGvtUL3Ievz+3hhh5Am1YMplRxsRQzdRAoF9uU="; + sha256 = "sha256-JiOH39vMDL6r9WKuPO0CDkRwGZtzl/GIFoSegVddFpw="; } else fetchzip { url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}-ubuntu-16.04.tgz"; - sha256 = "sha256-qie9svlzRoAsI33W+Sxh4YTVk1iPV0NVXfzfKlEUul4="; + sha256 = "sha256-V6r+VQrgz8uVSbRa2AmW4lnLxovk63FL7LqVKD46RBw="; }; meta = with lib; { diff --git a/pkgs/tools/security/semgrep/default.nix b/pkgs/tools/security/semgrep/default.nix index 35a2a459587c..1df7c515e305 100644 --- a/pkgs/tools/security/semgrep/default.nix +++ b/pkgs/tools/security/semgrep/default.nix @@ -4,6 +4,7 @@ , semgrep-core , buildPythonApplication , pythonPackages +, pythonRelaxDepsHook , pytestCheckHook , git @@ -19,12 +20,15 @@ buildPythonApplication rec { SEMGREP_CORE_BIN = "${semgrep-core}/bin/semgrep-core"; - postPatch = '' - substituteInPlace setup.py \ - --replace "typing-extensions~=4.2" "typing-extensions" \ - --replace "jsonschema~=3.2" "jsonschema" \ - --replace "boltons~=21.0" "boltons" + nativeBuildInputs = [ pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "attrs" + "boltons" + "jsonschema" + "typing-extensions" + ]; + postPatch = '' # remove git submodule placeholders rm -r ./src/semgrep/{lang,semgrep_interfaces} # link submodule dependencies diff --git a/pkgs/tools/security/solo2-cli/default.nix b/pkgs/tools/security/solo2-cli/default.nix index 18a9e256ddbe..ad3df92873a8 100644 --- a/pkgs/tools/security/solo2-cli/default.nix +++ b/pkgs/tools/security/solo2-cli/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "solo2-cli"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "solokeys"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CRufj4SAkM0Qdffq45dp41TUqnnWep4zCB0XrEjdoG8="; + sha256 = "sha256-+n+tc3BDHr93yc2TzvI1Xqpcl8fM+bF/KZdv0rWfIZ8="; }; - cargoSha256 = "sha256-Q6/Vi5TB0H3OQ4np/DYIpTOsTPTSDjHonFI24LJ5gWE="; + cargoSha256 = "sha256-2bBo5HXLYQj+R47exPyMbx/RIrykDHjRkLRNMjVAzEI="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 3cb8f758eb2a..871d309d5304 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { pname = "gptfdisk"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { # https://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home # page clearly implies a preference for using SourceForge's bandwidth: url = "mirror://sourceforge/gptfdisk/${pname}-${version}.tar.gz"; - sha256 = "sha256-ldGYVvAE2rxLjDQrJhLo0KnuvdUgBClxiDafFS6dxt8="; + sha256 = "sha256-2v6tJpP6646Ll4MrI0B/btWzIZvBeE9ILdhVd04tUMI="; }; patches = [ - # fix build failure against ncurses-6.3 (pending upstream inclusion): - # https://sourceforge.net/p/gptfdisk/mailman/message/37392412/ - ./ncurses-6.3.patch + # fix UUID generation (from upstream but not yet released): + # https://sourceforge.net/p/gptfdisk/code/ci/6a8416cbd12d55f882bb751993b94f72d338d96f/ + # https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1853985.html + ./uuid.patch ]; postPatch = '' diff --git a/pkgs/tools/system/gptfdisk/ncurses-6.3.patch b/pkgs/tools/system/gptfdisk/ncurses-6.3.patch deleted file mode 100644 index 4b8ec91aa04e..000000000000 --- a/pkgs/tools/system/gptfdisk/ncurses-6.3.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 9d5032d1487a8fe6ef7229d413418a27e32a28e5 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyich@gmail.com> -Date: Mon, 1 Nov 2021 07:51:10 +0000 -Subject: [PATCH:gptfdisk] gptcurses.cc: always use "%s"-style format for printf()-style - functions - -`ncuses-6.3` added printf-style function attributes and now makes -it easier to catch cases when user input is used in palce of format -string when built with CFLAGS=-Werror=format-security: - - gptcurses.cc:274:10: error: - format not a string literal and no format arguments [-Werror=format-security] - 274 | printw(theLine.c_str()); - | ~~~~~~^~~~~~~~~~~~~~~~~ - -Let's wrap all the missing places with "%s" format. ---- - gptcurses.cc | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - ---- a/gptcurses.cc -+++ b/gptcurses.cc -@@ -239,22 +239,22 @@ Space* GPTDataCurses::ShowSpace(int spaceNum, int lineNum) { - ClearLine(lineNum); - if (space->partNum == -1) { // space is empty - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); - printw("free space"); - } else { // space holds a partition - move(lineNum, 3); - printw("%d", space->partNum + 1); - move(lineNum, 12); -- printw(BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); -+ printw("%s", BytesToIeee((space->lastLBA - space->firstLBA + 1), blockSize).c_str()); - move(lineNum, 24); -- printw(space->origPart->GetTypeName().c_str()); -+ printw("%s", space->origPart->GetTypeName().c_str()); - move(lineNum, 50); - #ifdef USE_UTF16 - space->origPart->GetDescription().extract(0, 39, temp, 39); -- printw(temp); -+ printw("%s", temp); - #else -- printw(space->origPart->GetDescription().c_str()); -+ printw("%s", space->origPart->GetDescription().c_str()); - #endif - } // if/else - } // if -@@ -271,10 +271,10 @@ int GPTDataCurses::DisplayParts(int selected) { - - move(lineNum++, 0); - theLine = "Part. # Size Partition Type Partition Name"; -- printw(theLine.c_str()); -+ printw("%s", theLine.c_str()); - move(lineNum++, 0); - theLine = "----------------------------------------------------------------"; -- printw(theLine.c_str()); -+ printw("%s", theLine.c_str()); - numToShow = LINES - RESERVED_TOP - RESERVED_BOTTOM; - pageNum = selected / numToShow; - for (i = pageNum * numToShow; i <= (pageNum + 1) * numToShow - 1; i++) { -@@ -636,7 +636,7 @@ void GPTDataCurses::DisplayOptions(char selectedKey) { - } // if/else - } // for - move(LINES - 1, (COLS - optionDesc.length()) / 2); -- printw(optionDesc.c_str()); -+ printw("%s", optionDesc.c_str()); - currentKey = selectedKey; - } // if - } // GPTDataCurses::DisplayOptions() -@@ -748,11 +748,11 @@ void GPTDataCurses::DrawMenu(void) { - - clear(); - move(0, (COLS - title.length()) / 2); -- printw(title.c_str()); -+ printw("%s", title.c_str()); - move(2, (COLS - drive.length()) / 2); -- printw(drive.c_str()); -+ printw("%s", drive.c_str()); - move(3, (COLS - size.str().length()) / 2); -- printw(size.str().c_str()); -+ printw("%s", size.str().c_str()); - DisplayParts(currentSpaceNum); - } // DrawMenu - -@@ -802,7 +802,7 @@ void PromptToContinue(void) { - void Report(string theText) { - clear(); - move(0, 0); -- printw(theText.c_str()); -+ printw("%s", theText.c_str()); - move(LINES - 2, (COLS - 29) / 2); - printw("Press any key to continue...."); - cbreak(); diff --git a/pkgs/tools/system/gptfdisk/uuid.patch b/pkgs/tools/system/gptfdisk/uuid.patch new file mode 100644 index 000000000000..110c3d106b43 --- /dev/null +++ b/pkgs/tools/system/gptfdisk/uuid.patch @@ -0,0 +1,11 @@ +--- a/guid.cc ++++ b/guid.cc +@@ -141,7 +141,7 @@ void GUIDData::Zero(void) { + void GUIDData::Randomize(void) { + int i, uuidGenerated = 0; + +-#ifdef _UUID_UUID_H ++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H) + uuid_generate(uuidData); + ReverseBytes(&uuidData[0], 4); + ReverseBytes(&uuidData[4], 2); diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index d0dada770ee7..4be4ff33a5e0 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.7.10"; + version = "3.8.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-beU4hLW5Dp4xbY0kaxuxLD2XmMXdxWEBbAH/G+B5dHU="; + sha256 = "sha256-ONkdtp7aXP7dTxqIQ4IZ8c4zwzXVpEMMoXYnQQSU5x0="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c094df38748b..3a73b98a6b17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2953,6 +2953,8 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; + beautysh = callPackage ../development/tools/beautysh { }; + bc = callPackage ../tools/misc/bc { }; bdf2psf = callPackage ../tools/misc/bdf2psf { }; @@ -7870,6 +7872,8 @@ with pkgs; jmespath = callPackage ../development/tools/jmespath { }; + juicefs = callPackage ../tools/filesystems/juicefs { }; + jmtpfs = callPackage ../tools/filesystems/jmtpfs { }; jnettop = callPackage ../tools/networking/jnettop { }; @@ -13065,6 +13069,8 @@ with pkgs; algol68g = callPackage ../development/compilers/algol68g { }; + ante = callPackage ../development/compilers/ante { }; + armips = callPackage ../development/compilers/armips { stdenv = gcc10Stdenv; }; @@ -25301,6 +25307,8 @@ with pkgs; adwaita-qt = libsForQt5.callPackage ../data/themes/adwaita-qt { }; + adw-gtk3 = callPackage ../data/themes/adw-gtk3 { }; + agave = callPackage ../data/fonts/agave { }; aileron = callPackage ../data/fonts/aileron { }; @@ -28995,7 +29003,11 @@ with pkgs; klayout = libsForQt5.callPackage ../applications/misc/klayout { }; - klee = callPackage ../applications/science/logic/klee { }; + klee = callPackage ../applications/science/logic/klee (with llvmPackages_11; { + clang = clang; + llvm = llvm; + stdenv = stdenv; + }); kmetronome = libsForQt5.callPackage ../applications/audio/kmetronome { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65a387a1310c..63218f729214 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11217,6 +11217,8 @@ in { typer = callPackage ../development/python-modules/typer { }; + types-colorama = callPackage ../development/python-modules/types-colorama { }; + types-dateutil = callPackage ../development/python-modules/types-dateutil { }; types-decorator = callPackage ../development/python-modules/types-decorator { }; |