diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2a1d5f99abdb..2fb788f41d44 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8944,7 +8944,6 @@ githubId = 25083790; name = "Tomoya Otabi"; keys = [{ - longkeyid = "ed25519/0x9EA45A31DB994C53"; fingerprint = "3D14 6004 004C F882 D519 6CD4 9EA4 5A31 DB99 4C53"; }]; }; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index e2e6bce72c41..4787ec78bd3b 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -2,7 +2,7 @@ , fetchurl, libsecret }: let - version = "3.11.1"; + version = "3.23.69"; pname = "standardnotes"; name = "${pname}-${version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -13,12 +13,12 @@ let }.${stdenv.hostPlatform.system} or throwSystem; sha256 = { - i686-linux = "3e83a7eef5c29877eeffefb832543b21627cf027ae6e7b4f662865b6b842649a"; - x86_64-linux = "fd461e98248a2181afd2ef94a41a291d20f7ffb20abeaf0cfcf81a9f94e27868"; + i686-linux = "sha256-/A2LjV8ky20bcKgs0ijwldryi5VkyROwz49vWYXYQus="; + x86_64-linux = "sha256-fA9WH9qUtvAHF9hTFRtxQdpz2dpK0joD0zX9VYBo10g="; }.${stdenv.hostPlatform.system} or throwSystem; src = fetchurl { - url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-linux-${plat}.AppImage"; + url = "https://github.com/standardnotes/app/releases/download/%40standardnotes%2Fdesktop%40${version}/standard-notes-${version}-linux-${plat}.AppImage"; inherit sha256; }; @@ -59,6 +59,7 @@ in appimageTools.wrapType2 rec { homepage = "https://standardnotes.org"; license = licenses.agpl3; maintainers = with maintainers; [ mgregoire chuangzhu ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix new file mode 100644 index 000000000000..7a0d4e5f096d --- /dev/null +++ b/pkgs/applications/emulators/wibo/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "wibo"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "decompals"; + repo = "WiBo"; + rev = version; + sha256 = "sha256-zv+FiordPo7aho3RJqDEe/1sJtjVt6Vy665VeNul/Kw="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Quick-and-dirty wrapper to run 32-bit windows EXEs on linux"; + longDescription = '' + A minimal, low-fuss wrapper that can run really simple command-line + 32-bit Windows binaries on Linux - with less faff and less dependencies + than WINE. + ''; + homepage = "https://github.com/decompals/WiBo"; + license = licenses.mit; + maintainers = with maintainers; [ r-burns ]; + platforms = [ "i686-linux" ]; + }; +} diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 070727b772a4..5456b6b684f6 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -33,7 +33,6 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin && stdenv.isx86_64; description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index aa69148bd964..2726f37f4aa0 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4904"; + version = "4905"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-43gJkpk19Ef3vUbRNt3VDstxCLJl6smsAjtcrovGjEE="; + sha256 = "sha256-EYUysLit/bO/IjVmAbxqIvVFm9Ub50+RKFn7ZdspapU="; }; patches = [ diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index e886f40c8a57..fa2cdb980df0 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -29,8 +29,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -53,17 +53,17 @@ GEM http-form_data (~> 2.2) http-parser (~> 1.2.0) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - i18n (1.10.0) + i18n (1.11.0) concurrent-ruby (~> 1.0) jsonpath (1.1.2) multi_json - jwt (2.3.0) - krane (2.4.6) + jwt (2.4.1) + krane (2.4.7) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -83,11 +83,11 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - minitest (5.15.0) + minitest (5.16.2) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.3) netrc (0.11.0) - oj (3.13.11) + oj (3.13.16) os (1.1.4) public_suffix (4.0.7) rake (13.0.6) @@ -98,18 +98,18 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby2_keywords (0.0.5) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.1.2) + statsd-instrument (3.2.1) thor (1.2.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) PLATFORMS ruby diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 3c18789c0953..d29904200c4b 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -233,10 +233,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; + sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; http-form_data = { groups = ["default"]; @@ -265,10 +265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1g0g9qaarwn9ga8889r7lnaybygvd2a2dp4ilc73g4rsxxcrgy0x"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; jsonpath = { dependencies = ["multi_json"]; @@ -286,10 +286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; krane = { dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; @@ -297,10 +297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16rf7qzwshlbhrc9fdgq44fcf2qbgjwik1kwkv1gncy12lvwfdmz"; + sha256 = "0hmsz359zkpw1spyxx22wijzjls22qsak6rbrlv1ybk3hhk13vjg"; type = "gem"; }; - version = "2.4.6"; + version = "2.4.7"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -349,10 +349,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; multi_json = { groups = ["default"]; @@ -369,10 +369,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; netrc = { groups = ["default"]; @@ -389,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl"; + sha256 = "1i8yrwnf5mzixl8a4h3cfx93gkzcs7q6grpyv0zng1vga9cmk28n"; type = "gem"; }; - version = "3.13.11"; + version = "3.13.16"; }; os = { groups = ["default"]; @@ -461,20 +461,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1"; + sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x"; type = "gem"; }; - version = "0.16.1"; + version = "0.17.0"; }; statsd-instrument = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q98rkmgrzb59zmswhr6863z6dk042i90jbp9pflwa2vy2xkfj0y"; + sha256 = "0653pjqln9r52nfkcjna0wf4q9ws114pz29wav2nlf18v8jazqbf"; type = "gem"; }; - version = "3.1.2"; + version = "3.2.1"; }; thor = { groups = ["default"]; @@ -513,9 +513,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; } diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index d881e3a146e6..5f6c61417ac5 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -35,8 +35,5 @@ buildGoModule rec { homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; - # requires >= 10.14 SDK https://github.com/NixOS/nixpkgs/issues/101229 - # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 21619683b331..1dd8361f2032 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -24,13 +24,5 @@ buildGoModule rec { homepage = "https://tilt.dev/"; license = licenses.asl20; maintainers = with maintainers; [ anton-dessiatov ]; - - # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin - # Undefined symbols for architecture x86_64: - # "_SecTrustEvaluateWithError", referenced from: - # _crypto/x509/internal/macos.x509_SecTrustEvaluateWithError_trampoline.abi0 in go.o - # "_utimensat", referenced from: - # _syscall.libc_utimensat_trampoline.abi0 in go.o - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 21244a1859b1..e24c41039487 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner -, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam +, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa }: stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0cws9jfnmxqycmlyllvvqzw4jsbrwwk10v9gy8wifv3c61rwgdkk"; + sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4="; }; nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; - buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ]; + buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ]; meta = with lib; { description = "A VNC server for wlroots based Wayland compositors"; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index f584eea5cca5..531c0f965834 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "clLSkby7bmjScUpSZkVvHt5nSIoQOaYrxsoLqiuQZik="; + sha256 = "WSK2b1DYSYEFqmVIOlhjFGyqC9ok/9rWAz2ZgUZejzo="; }; modRoot = "./agent"; - vendorSha256 = "sha256-XVLsmU4EfOTFVpF5he+FCyDr/NuApUBC9R00nO1HJrg="; + vendorSha256 = "sha256-UDsgfsdq8DecyTAFrmWO09V3JIuTA5YLCEAei0tYRy4="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d663d0ec8b7b..370c37ffec23 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -97,8 +97,5 @@ buildGoModule rec { changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; - # requires >= 10.13 SDK https://github.com/NixOS/nixpkgs/issues/101229 - # Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 94d3472ca69e..db2133d0110e 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.11"; + version = "1.17.12"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-rCZJpllExqWr5VBUAA7uPXcZaIDaNqNVX2LgZUDo61Q="; + sha256 = "sha256-DVG1s/KAwPAfU0WYwCGdtYePM32mE3qe5ph3dBNgcgk="; }; strictDeps = true; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 539288acd4c8..43fa2027cc81 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.0"; + version = "11.2.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-31yiFZAcaMY0Z8C/7hTwjjTYdaR6sPCVCCqzLd/08kM="; + sha256 = "sha256-1AHZmkImwoxb+9nUMB8LM/4sgAyoZavgDNnFk+OTpic="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 980424b7fd48..728e4bf4272a 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml +, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1wpq1vyjqra877vwc3n4i0c1dyhmabyn993cslf1k142ikyc0a8w"; + sha256 = "sha256-hdfiF3CUosOksx+Fze54kPfDqS9hvXWmCBB1VQ4uyiQ="; }; nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; + buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ]; meta = with lib; { description = "A VNC server library"; diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/development/tools/convco/default.nix index 720423472c30..1ab32615d83b 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jr1rNxVguASl6fPfGNx2/MDlMC+KokgQyzhBnvqnwFs="; + sha256 = "sha256-v/0NtJYprd8YxwSdeH4v7mY0v3vElDx2PNIIUKsczW8="; }; - cargoSha256 = "sha256-mStoWH/SusAcbAR3MeBWaY21TdJZJcKm1VxmA3zmlTw="; + cargoSha256 = "sha256-Zh/Aiuu1Mx2osscSG0E1MTGKCVsYtL66FUnew6OCyZ4="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 7e2570bcd234..33fa43f03ddf 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { homepage = "https://golangci-lint.run/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ anpryl manveru mic92 ]; - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index c3bf856bc9bc..08e3e5456209 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "universal-ctags"; - version = "5.9.20220529.0"; + version = "5.9.20220710.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "sha256-Lu4eYMA5Uf/A8r11W6v7xTAnj0gtCjKQ4aX5IbV0dbo="; + sha256 = "sha256-/7g1AGLbl49s8hbwy3IGwshKAGKRJrdbECau2acMtjE="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/tools/rust/probe-rs-cli/default.nix b/pkgs/development/tools/rust/probe-rs-cli/default.nix index 4978c4a3c3e6..0cce6354fb99 100644 --- a/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.12.0"; + version = "0.13.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU="; + sha256 = "sha256-3aKRUABJ1LkRGzwDSwQZeNXKGeRmTlbHKSGewfKn+2Q="; }; - cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA="; + cargoSha256 = "sha256-bOfdpRVm9zqpFF/YmD06u4OKdyqXwfCSTNlTIZZygeg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://probe.rs/"; changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ xgroleau ]; + maintainers = with maintainers; [ xgroleau newam ]; }; } diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 3d137f58414e..0a591cc8141e 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -22,16 +22,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.24.3"; + version = "1.25.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-JpOOFwlTgwwBCrXOGYskFTgS6RZ7mHQJGT0jnHavxvI="; + sha256 = "sha256-zCr8xu0j/pBsdJEAYTCGrEouA8QumBnyhM4YLFZJqZI="; }; - cargoSha256 = "sha256-hAfGpKaWD94IxFFpnW9XwQp4P9clUX6mmekwodCK0Ag="; + cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY="; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 5ea9a4a78e87..cdc82dc26aed 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.350"; + version = "0.0.351"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-bpaDgjR1Om+4IYLIUjqJkxa9mbdscItwnTWYG7Wlms0="; + sha256 = "sha256-vxX11kaQMOQ2LJ/2q4QrlzMmuJtkn1Oe1iBHQgXn0mI="; }; - vendorSha256 = "sha256-OKA3J4MExysucOJl9UkH3mI4VbJgoOEIVa/iv22kxac="; + vendorSha256 = "sha256-gAdKrPU6js3zrzX2+NWQZSXxGuuUiggprua4gvd++OQ="; subPackages = [ "." ]; diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index f2ca8d874714..b4621feeb31f 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, libopcodes, libbfd, libelf, readline +, libopcodes, libbfd, elfutils, readline , linuxPackages_latest, zlib , python3, bison, flex }: @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit (linuxPackages_latest.kernel) version src; nativeBuildInputs = [ python3 bison flex ]; - buildInputs = [ libopcodes libbfd libelf zlib readline ]; + buildInputs = [ libopcodes libbfd elfutils zlib readline ]; preConfigure = '' patchShebangs scripts/bpf_doc.py diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index cf7517718f2f..6cc9e40bdbf7 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , cmake, pkg-config, flex, bison , llvmPackages, elfutils -, libelf, libbfd, libbpf, libopcodes, bcc +, libbfd, libbpf, libopcodes, bcc , cereal, asciidoctor , nixosTests , util-linux @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = with llvmPackages; [ llvm libclang - elfutils libelf bcc + elfutils bcc libbpf libbfd libopcodes cereal asciidoctor ]; diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index d2346d7ff5ed..e7689ca7972d 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-z7QFnx414sdGazUZIenAVA+7LcSZT0tTb/ldv1SGV3Q="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-PYq6AKX3Ifo8vMnPYGjqHwFejOBuQjhfDG5nXnccfvE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-Pbl7YaDVxdER/ubOiPq54ASB4ILnH0B3GiQlQBe7gFs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-ep5/VMO7LmfD6+chG2SGwkc5awoeqACQeP04YpMXI1s="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-P2PsSdpW5i2hwBPUKb+viYewlVHTER/eBkwPp3koawo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-rD5UDkAMeBfnrEpxfZWgDQEUN+82D6Ul2gjclS8A8CU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-cbTlVBlGdFgEz2b6pb0SJ7yUf4wFXnZwLCkmvX75FzU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-buBp5WZ1jIzQDbxzVOZC/t3iv1Dw0P/PN3wGBbGaYvU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-TKZ3bOM5oq30GtLn9ifNyY6+2Li4nf1+r2L0ExG/10c="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-d6Z46L6qeXi5UNPY3/nlTJvVCuQ0lamtR49Z73O87Wc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index b193fd2cfdfe..66b8b12e09cc 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.7"; + version = "0.107.8"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index 68e00dc84de0..c956f0fc44a7 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-n4+qUCbjqxLmGuCQ0QTscJ3me0UZUP/7ggvGp1pNkfg="; + sha256 = "sha256-fUGeQM+7FRGTRL3J4c2+c+NTwrM6d99F2ucKsou2kRk="; fetchSubmodules = true; }; diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index e8803532d5cc..0bc554d96fa9 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -74,8 +74,5 @@ buildGoModule rec { ''; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ jk ]; - # Need updated macOS SDK - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 121c854f929e..6515088c3981 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -49,8 +49,5 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk ]; - # Need updated macOS SDK - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index eb897f839a8f..6287c532382f 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -8,17 +8,24 @@ , ninja , pkg-config , wine -, boost , libxcb , nix-update-script }: let + # Derived from subprojects/asio.wrap + asio = fetchFromGitHub { + owner = "chriskohlhoff"; + repo = "asio"; + rev = "asio-1-22-1"; + sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; + }; + # Derived from subprojects/bitsery.wrap bitsery = fetchFromGitHub { owner = "fraillt"; repo = "bitsery"; - rev = "c0fc083c9de805e5825d7553507569febf6a6f93"; + rev = "v5.2.2"; sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; }; @@ -26,15 +33,23 @@ let function2 = fetchFromGitHub { owner = "Naios"; repo = "function2"; - rev = "02ca99831de59c7c3a4b834789260253cace0ced"; + rev = "4.2.0"; sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; }; + # Derived from subprojects/ghc_filesystem.wrap + ghc_filesystem = fetchFromGitHub { + owner = "gulrak"; + repo = "filesystem"; + rev = "v1.5.12"; + sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; + }; + # Derived from subprojects/tomlplusplus.wrap tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "8e669aa6990e0ed219c169d491472d749f54c393"; + rev = "v3.0.1"; sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4="; }; @@ -42,29 +57,29 @@ let vst3 = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; - rev = "v3.7.4_build_25-patched"; + rev = "v3.7.5_build_44-patched"; fetchSubmodules = true; - sha256 = "sha256-oHRJZItw+he5M+beVZkUrhJir6rgFZ80ORzA73mJT2A="; + sha256 = "sha256-6cuEUa+BXa6MnAYIBq873n0NRLadcPfMX+kpf4ysE6M="; }; in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.8.1"; + version = "4.0.2"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - sha256 = "sha256-5Mi/aIjOKbn7guTj+AKGQRv+k7w4gzfdA9Mw4ocUlOE="; + sha256 = "sha256-rce6gxnB+RpG84Xakw0h4vZ8lyEQ41swWQGuwpomV2I="; }; # Unpack subproject sources postUnpack = ''( cd "$sourceRoot/subprojects" + cp -R --no-preserve=mode,ownership ${asio} asio cp -R --no-preserve=mode,ownership ${bitsery} bitsery - cp packagefiles/bitsery/* bitsery cp -R --no-preserve=mode,ownership ${function2} function2 - cp packagefiles/function2/* function2 + cp -R --no-preserve=mode,ownership ${ghc_filesystem} ghc_filesystem cp -R --no-preserve=mode,ownership ${tomlplusplus} tomlplusplus cp -R --no-preserve=mode,ownership ${vst3} vst3 )''; @@ -73,14 +88,23 @@ in multiStdenv.mkDerivation rec { # Hard code bitbridge & runtime dependencies (substituteAll { src = ./hardcode-dependencies.patch; - boost32 = pkgsi686Linux.boost; libxcb32 = pkgsi686Linux.xorg.libxcb; inherit libnotify wine; }) + + # Patch the chainloader to search for libyabridge through NIX_PROFILES + ./libyabridge-from-nix-profiles.patch ]; postPatch = '' patchShebangs . + ( + cd subprojects + cp packagefiles/asio/* asio + cp packagefiles/bitsery/* bitsery + cp packagefiles/function2/* function2 + cp packagefiles/ghc_filesystem/* ghc_filesystem + ) ''; nativeBuildInputs = [ @@ -91,18 +115,12 @@ in multiStdenv.mkDerivation rec { ]; buildInputs = [ - boost libxcb ]; - # 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"; - mesonFlags = [ "--cross-file" "cross-wine.conf" - "-Dwith-bitbridge=true" + "-Dbitbridge=true" # Requires CMake and is unnecessary "-Dtomlplusplus:generate_cmake_config=false" @@ -111,10 +129,8 @@ in multiStdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p "$out/bin" "$out/lib" - cp yabridge-group*.exe{,.so} "$out/bin" - cp yabridge-host*.exe{,.so} "$out/bin" - cp libyabridge-vst2.so "$out/lib" - cp libyabridge-vst3.so "$out/lib" + cp yabridge-host{,-32}.exe{,.so} "$out/bin" + cp libyabridge{,-chainloader}-{vst2,vst3}.so "$out/lib" runHook postInstall ''; @@ -131,8 +147,8 @@ in multiStdenv.mkDerivation rec { }; meta = with lib; { - description = "Yet Another VST bridge, run Windows VST2 plugins under Linux"; - homepage = "https://github.com/robbert-vdh/yabridge"; + description = "A modern and transparent way to use Windows VST2 and VST3 plugins on Linux"; + homepage = src.meta.homepage; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index 16385db69e9a..e54ba1e9386d 100644 --- a/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,16 +1,8 @@ diff --git a/meson.build b/meson.build -index c71d4fdb..b3f381ba 100644 +index bfab6361..9085db0f 100644 --- a/meson.build +++ b/meson.build -@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge - 'boost_filesystem', - static : with_static_boost, - dirs : [ -+ '@boost32@/lib', - # Used by Arch based distros - '/usr/local/lib32', - '/usr/lib32', -@@ -224,7 +225,7 @@ if is_64bit_system +@@ -187,7 +187,7 @@ if is_64bit_system xcb_64bit_dep = dependency('xcb') endif if with_32bit_libraries or with_bitbridge @@ -19,25 +11,29 @@ index c71d4fdb..b3f381ba 100644 endif # These are all headers-only libraries, and thus won't require separate 32-bit -diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index fc2c8b25..c73249e3 100644 ---- a/src/plugin/utils.cpp -+++ b/src/plugin/utils.cpp -@@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const { - access(wineloader_path.c_str(), X_OK) == 0) { - wine_path = wineloader_path; - } else { -- wine_path = bp::search_path("wine").string(); -+ wine_path = "@wine@/bin/wine"; +diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp +index da27a1bf..18482e06 100644 +--- a/src/common/notifications.cpp ++++ b/src/common/notifications.cpp +@@ -49,7 +49,7 @@ bool send_notification(const std::string& title, + } } - bp::ipstream output; -@@ -436,7 +436,7 @@ Configuration load_config_for(const fs::path& yabridge_path) { - bool send_notification(const std::string& title, - const std::string body, - bool append_origin) { -- const fs::path notify_send_path = bp::search_path("notify-send"); -+ const fs::path notify_send_path = "@libnotify@/bin/notify-send"; - if (notify_send_path.empty()) { - return false; - } +- Process process("notify-send"); ++ Process process("@libnotify@/bin/notify-send"); + process.arg("--urgency=normal"); + process.arg("--app-name=yabridge"); + process.arg(title); +diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp +index acd431bc..8566281c 100644 +--- a/src/plugin/utils.cpp ++++ b/src/plugin/utils.cpp +@@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const { + // The '*.exe' scripts generated by winegcc allow you to override the binary + // used to run Wine, so will will handle this in the same way for our Wine + // version detection. We'll be using `execvpe` +- std::string wine_path = "wine"; ++ std::string wine_path = "@wine@/bin/wine"; + // NOLINTNEXTLINE(concurrency-mt-unsafe) + if (const char* wineloader_path = getenv("WINELOADER"); + wineloader_path && access(wineloader_path, X_OK) == 0) { diff --git a/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch new file mode 100644 index 000000000000..4d714d38fa20 --- /dev/null +++ b/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch @@ -0,0 +1,71 @@ +diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp +index ccd65d33..c7136b37 100644 +--- a/src/chainloader/utils.cpp ++++ b/src/chainloader/utils.cpp +@@ -29,8 +29,10 @@ + namespace fs = ghc::filesystem; + + void* find_plugin_library(const std::string& name) { ++ Logger logger = Logger::create_exception_logger(); ++ + // Just using a goto for this would probably be cleaner, but yeah... +- const auto impl = [&name]() -> void* { ++ const auto impl = [&name, &logger]() -> void* { + // If `name` exists right next to the Wine plugin host binary, then + // we'll try loading that. Otherwise we'll fall back to regular + // `dlopen()` for distro packaged versions of yabridge +@@ -52,27 +54,28 @@ void* find_plugin_library(const std::string& name) { + } + } + +- if (void* handle = dlopen(name.c_str(), RTLD_LAZY | RTLD_LOCAL)) { +- return handle; ++ auto nix_profiles = getenv("NIX_PROFILES"); ++ if (!nix_profiles || nix_profiles[0] == '\0') { ++ logger.log(""); ++ logger.log("ERROR: 'NIX_PROFILES' environment variable is not set"); ++ logger.log(""); ++ return nullptr; + } + +- // One last Hail Mary, in case ldconfig was not set up correctly. This +- // might be relevant for some of the `/usr/local/*` locations (although +- // you really, really shouldn't install yabridge there, please, thank +- // you). Yabridgectl searches through these same directories. +- for (const auto& lib_dir : { +- "/usr/lib", +- "/usr/lib/x86_64-linux-gnu", +- "/usr/lib64", +- "/usr/local/lib", +- "/usr/local/lib/x86_64-linux-gnu", +- "/usr/local/lib64", +- }) { +- const fs::path candidate = fs::path(lib_dir) / name; +- if (void* handle = +- dlopen(candidate.c_str(), RTLD_LAZY | RTLD_LOCAL)) { ++ // NIX_PROFILES is iterated in reverse from the most specific (the ++ // user profile) to the least specific (the system profile). ++ const std::string_view nix_profiles_view = nix_profiles; ++ auto segment_end = nix_profiles_view.size(); ++ while (segment_end != std::string::npos) { ++ const auto next_segment_end = nix_profiles_view.rfind(' ', segment_end - 1); ++ const auto segment_begin = next_segment_end + 1; ++ const auto profile = nix_profiles_view.substr(segment_begin, segment_end - segment_begin); ++ const auto candidate = fs::path(profile) / "lib" / name; ++ if (auto handle = dlopen(candidate.c_str(), RTLD_LAZY | RTLD_LOCAL)) { + return handle; + } ++ ++ segment_end = next_segment_end; + } + + return nullptr; +@@ -82,8 +85,6 @@ void* find_plugin_library(const std::string& name) { + if (!handle) { + const fs::path this_plugin_path = get_this_file_location(); + +- Logger logger = Logger::create_exception_logger(); +- + logger.log(""); + logger.log("Could not find '" + name + "'"); + logger.log(""); diff --git a/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch similarity index 80% rename from pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch rename to pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch index 905068f75f8c..b687a6c01ae2 100644 --- a/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch +++ b/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch @@ -1,23 +1,23 @@ diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs -index bc5f6a81..0fcd38d3 100644 +index 523a083b..399302e0 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs -@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet}; +@@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize}; + use std::collections::{BTreeMap, BTreeSet, HashSet}; use std::env; - use std::fmt::Display; use std::fs; +use std::iter; use std::path::{Path, PathBuf}; use which::which; use xdg::BaseDirectories; -@@ -235,34 +236,27 @@ impl Config { +@@ -213,34 +214,27 @@ impl Config { } } None => { - // Search in the system library locations and in `~/.local/share/yabridge` if no - // path was set explicitely. We'll also search through `/usr/local/lib` just in case - // but since we advocate against installing yabridge there we won't list this path -- // in the error message when `libyabridge-vst2.so` can't be found. +- // in the error message when `libyabridge-chainloader-vst2.so` can't be found. - let system_path = Path::new("/usr/lib"); + // Search through NIX_PROFILES & data home directory if no path was set explicitly. + // NIX_PROFILES is iterated in reverse from the most specific (the user profile) to @@ -43,7 +43,7 @@ index bc5f6a81..0fcd38d3 100644 + let mut candidates = lib_directories - .iter() - .map(|directory| directory.join(LIBYABRIDGE_VST2_NAME)); + .map(|directory| directory.join(VST2_CHAINLOADER_NAME)); + match candidates.find(|directory| directory.exists()) { Some(candidate) => candidate, @@ -53,21 +53,21 @@ index bc5f6a81..0fcd38d3 100644 - default search path using 'yabridgectl set --path='.", + "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the \ + default search path using 'yabridgectl set --path='.", - LIBYABRIDGE_VST2_NAME, + VST2_CHAINLOADER_NAME, - system_path.display(), user_path.display() )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs -index 48cce4fa..209e40e4 100644 +index 302ff8ae..9d9bbeac 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs -@@ -151,7 +151,7 @@ fn main() -> Result<()> { - .help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") +@@ -130,7 +130,7 @@ fn main() -> Result<()> { + .help("Path to the directory containing 'libyabridge-chainloader-{vst2,vst3}.so'") .long_help( - "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ -- is not set, then yabridgectl will look in both '/usr/lib' and \ -+ is not set, then yabridgectl will look through 'NIX_PROFILES' and \ + "Path to the directory containing 'libyabridge-chainloader-{vst2,vst3}.so'. \ +- If this is not set, then yabridgectl will look in both '/usr/lib' and \ ++ If this is not set, then yabridgectl will look through 'NIX_PROFILES' and \ '~/.local/share/yabridge' by default.", ) .validator(validate_path) diff --git a/pkgs/tools/audio/yabridgectl/default.nix b/pkgs/tools/audio/yabridgectl/default.nix index 6ab94ef36302..ebd5577e7d13 100644 --- a/pkgs/tools/audio/yabridgectl/default.nix +++ b/pkgs/tools/audio/yabridgectl/default.nix @@ -11,13 +11,14 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoSha256 = "sha256-ducF55d5OvCwlNFtt2r6pG5e9VevM2AzHSvPnWvIp1Y="; + cargoSha256 = "sha256-09GsrQAI08Qih/TpbEAh4hn7IfvwyFdEoyzsSjcjGXY="; patches = [ - # By default, yabridgectl locates libyabridge.so by using - # hard coded distro specific lib paths. This patch replaces those - # hard coded paths with lib paths from NIX_PROFILES. - ./libyabridge-from-nix-profiles.patch + # Patch yabridgectl to search for the chainloader through NIX_PROFILES + ./chainloader-from-nix-profiles.patch + + # Dependencies are hardcoded in yabridge, so the check is unnecessary and likely incorrect + ./remove-dependency-verification.patch ]; patchFlags = [ "-p3" ]; @@ -26,12 +27,14 @@ rustPlatform.buildRustPackage rec { postFixup = '' wrapProgram "$out/bin/yabridgectl" \ - --prefix PATH : ${lib.makeBinPath [ wine ]} + --prefix PATH : ${lib.makeBinPath [ + wine # winedump + ]} ''; meta = with lib; { description = "A small, optional utility to help set up and update yabridge for several directories at once"; - homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl"; + homepage = "${src.meta.homepage}/tree/${version}/tools/yabridgectl"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = yabridge.meta.platforms; diff --git a/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch new file mode 100644 index 000000000000..2f860fb4f15e --- /dev/null +++ b/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch @@ -0,0 +1,18 @@ +diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs +index 9ecdb140..061a8ff3 100644 +--- a/tools/yabridgectl/src/actions.rs ++++ b/tools/yabridgectl/src/actions.rs +@@ -712,13 +712,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> { + // be the case if we get to this point though. + verify_path_setup(config)?; + +- // This check is only performed once per combination of Wine and yabridge versions +- verify_wine_setup(config)?; +- +- // Yabridge uses notify-send to relay important information when something's very wrong, so +- // we'll check whether this is installed +- verify_external_dependencies()?; +- + Ok(()) + } + diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index d9fe703f284e..6aa22a7f64f0 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -56,8 +56,5 @@ buildGoModule rec { homepage = "https://github.com/multiprocessio/dsq"; license = licenses.asl20; maintainers = with maintainers; [ liff ]; - # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin - # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix index 386dcb05e0c9..818642af9753 100644 --- a/pkgs/tools/misc/page/default.nix +++ b/pkgs/tools/misc/page/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "page"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "I60R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CCjF0KwXd0XSga6/wlWpUPU+Xr0hjWIVVXIP0M8Hh5g="; + sha256 = "sha256-3XRtTiIqUI2j9kmsg0yeuipgHEzdJRG2abO3Ll7ukmA="; }; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $completions_dir/_page ''; - cargoSha256 = "sha256-MFNc4U6DAb5UscqxKz7RORoPeqne2pdkL/+mLLL+pKM="; + cargoSha256 = "sha256-4Z58OkCvlGXmuTeVl0me3a/YImcKwggF9tXfenQnjtA="; meta = with lib; { description = "Use neovim as pager"; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 0341e7e7f3d3..5013ad60caff 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.11.0"; + version = "1.11.4"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8g5rrkRA31wHvwY3JDFIU+slU0cLHFpADyd897hVyw0="; + sha256 = "sha256-NLGX72eZCfyh6y3mud/btMh15rNXnss7S0P7ujCX1ms="; }; - vendorSha256 = "sha256-iW14KxtUY2nhpShcdrHLiCRZxsoXyLSPt01dB0Ds28Y="; + vendorSha256 = "sha256-zaWN/zI4WhHnEK12k1tWZ/qjLGvaZbJ4WfEvCZJ0+ms="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/pkgs/tools/security/gitsign/default.nix b/pkgs/tools/security/gitsign/default.nix index 4e207f2fd142..00a8a3a4735d 100644 --- a/pkgs/tools/security/gitsign/default.nix +++ b/pkgs/tools/security/gitsign/default.nix @@ -20,8 +20,5 @@ buildGoModule rec { description = "Keyless Git signing using Sigstore"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lesuisse ]; - # Need updated macOS SDK - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 40908c6a3c0c..aa7b9158adea 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -69,8 +69,5 @@ buildGoModule rec { ''; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab jk ]; - # Need updated macOS SDK - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1be96d46c37a..d335831ad5a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35481,6 +35481,8 @@ with pkgs; websocketd = callPackage ../applications/networking/websocketd { }; + wibo = pkgsi686Linux.callPackage ../applications/emulators/wibo { }; + wike = callPackage ../applications/misc/wike { }; wikicurses = callPackage ../applications/misc/wikicurses {