diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 2bd6cf03cc08..d5afcac86cd4 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -52,7 +52,7 @@ , vamp-plugin-sdk , wafHook , xjadeo -, videoSupport ? false +, videoSupport ? true }: stdenv.mkDerivation rec { pname = "ardour"; diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index cb45f5b7a827..f22109b791d8 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HVWZ0XF1oBUHhkOQHELlZ/pxXUsUo2cVo6EhZl6S0W4="; + sha256 = "sha256-pn8GtFAZMQyFjOpn6blNBoDgQL7X1gaYjGsQHwvMzaQ="; }; - vendorSha256 = "sha256-LhmZRa7vDylA4DRTfKFRs3lQMnwNfzF1H6ki1/zdpUg="; + vendorSha256 = "sha256-egZFJSGnFYfOcBMNNEsPV6ngf3ddoYCSntnuloYfpxo="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index b6a1a7a2c174..89547c23b875 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2108.26"; + version = "2110.31"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "1dvwn5rs4ss4rwd64namy8ccz8dagkk84qjg13sxxqizyd5y08h1"; + sha256 = "sha256-SyPQtmudfogBwASTApl1hSpOPf2PLTSOzhJAJzrQ3Mg="; postFetch = '' mkdir -p $out/share/fonts/ @@ -18,6 +18,7 @@ fetchzip { meta = with lib; { description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; homepage = "https://github.com/microsoft/cascadia-code"; + changelog = "https://github.com/microsoft/cascadia-code/raw/v${version}/FONTLOG.txt"; license = licenses.ofl; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libfyaml/default.nix b/pkgs/development/libraries/libfyaml/default.nix index dc599a48f380..e1e30657a352 100644 --- a/pkgs/development/libraries/libfyaml/default.nix +++ b/pkgs/development/libraries/libfyaml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libfyaml"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "pantoniou"; repo = pname; rev = "v${version}"; - sha256 = "0wq7ah9a83w0c5qppdpwqqjffwi85q7slz4im0kmkhxdp23v9m1i"; + sha256 = "sha256-RxaeDtsdPtcTYJ7qMVmBCm1TsMI7YsXCz2w/Bq2RmaA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 501d52c60746..a0d0ced824d8 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.5.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f93zpTA3FWfqmPVnhnvGBJSqQ2OEHMxnI6MUN74LmAk="; + sha256 = "sha256-gW7uunW7gE/5umBQNjx+k2FIAryKka7yLMqnd6ewv6I="; }; - vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80="; + vendorSha256 = "sha256-GDXkrrE0KgFJHXCDZH83/nQAexKhmGed/QGZ1aSXnpg="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 713b1df0c4e9..f6dd32396d84 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, flex, bison, systemd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd }: stdenv.mkDerivation rec { pname = "fluent-bit"; @@ -12,7 +12,21 @@ stdenv.mkDerivation rec { }; patches = lib.optionals stdenv.isDarwin [ - ./fix-cmetrics-darwin.patch + # Fix compilations errors on darwin + (fetchpatch { + url = "https://github.com/calyptia/cmetrics/commit/4f0f7ae2eeec148a69156f9fcc05d64bf249d11e.patch"; + sha256 = "sha256-M1+28mHxpMvcFkOoKxkMMo1VCQsG33ncFZkFalOq2FQ="; + stripLen = 1; + extraPrefix = "lib/cmetrics/"; + }) + (fetchpatch { + url = "https://github.com/calyptia/cmetrics/commit/a97999cb6d7299ef230d216b7a1c584b43c64de9.patch"; + sha256 = "sha256-RuyPEeILc86n/klPIb334XpX0F71nskQ8s/ya0rE2zI="; + stripLen = 1; + extraPrefix = "lib/cmetrics/"; + }) + + # Fix bundled luajit compilation args ./fix-luajit-darwin.patch ]; diff --git a/pkgs/tools/misc/fluent-bit/fix-cmetrics-darwin.patch b/pkgs/tools/misc/fluent-bit/fix-cmetrics-darwin.patch deleted file mode 100644 index 8bd77605cbc0..000000000000 --- a/pkgs/tools/misc/fluent-bit/fix-cmetrics-darwin.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git i/lib/cmetrics/src/cmt_time.c w/lib/cmetrics/src/cmt_time.c ---- i/lib/cmetrics/src/cmt_time.c -+++ w/lib/cmetrics/src/cmt_time.c -@@ -20,7 +20,7 @@ - #include - - /* MacOS */ --#ifdef FLB_HAVE_CLOCK_GET_TIME -+#ifdef CMT_HAVE_CLOCK_GET_TIME - #include - #include - #endif -@@ -41,8 +41,8 @@ - mach_timespec_t mts; - host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); - clock_get_time(cclock, &mts); -- tm->tv_sec = mts.tv_sec; -- tm->tv_nsec = mts.tv_nsec; -+ tm.tv_sec = mts.tv_sec; -+ tm.tv_nsec = mts.tv_nsec; - mach_port_deallocate(mach_task_self(), cclock); - #else /* __STDC_VERSION__ */ - clock_gettime(CLOCK_REALTIME, &tm); diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 3b3f5ed44e70..1d3346044d40 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -24,12 +24,12 @@ let in stdenv.mkDerivation rec { pname = "ghidra"; - version = "10.0"; - versiondate = "20210621"; + version = "10.0.4"; + versiondate = "20210928"; src = fetchzip { url = "https://github.com/NationalSecurityAgency/ghidra/releases/download/Ghidra_${version}_build/ghidra_${version}_PUBLIC_${versiondate}.zip"; - sha256 = "0m1ksng2fkmcg7m22lqil10qn95s06gxnxdz7ih9qpbx67pmmq9x"; + hash = "sha256-nc+5Aqid3hGzbcKMCCaQ9E9AGOB3JyNkJn+3Yz8ewhM="; }; nativeBuildInputs = [