jiebi/CodeConvo huggingface dataset:
odbc = "sha256-T+RIIKzZ9xEg/E72pfs5xqHz2WuIWKx/oRfDrQbw3ms="; }; x86_64-darwin = { <del> basic = "f4335c1d53e8188a3a8cdfb97494ff87c4d0f481309284cf086dc64080a60abd"; sdk = "b46b4b87af593f7cfe447cfb903d1ae5073cec34049143ad8cdc9f3e78b23b27"; sqlplus = "f7565c3cbf898b0a7953fbb0017c5edd9d11d1863781588b7caf3a69937a2e9e"; tools = "b2bc474f98da13efdbc77fd05f559498cd8c08582c5b9038f6a862215de33f2c"; odbc = "f91da40684abaa866aa059eb26b1322f2d527670a1937d678404c991eadeb725"; </del> <ins> basic = "sha256-V+1BmPOhDYPNXdwkcsBY1MOwt4Yka66/a7/HORzBIIc="; sdk = "sha256-D6iuTEQYqmbOh1z5LnKN16ga6vLmjnkm4QK15S/Iukw="; sqlplus = "sha256-08uoiwoKPZmTxLZLYRVp0UbN827FXdhOukeDUXvTCVk="; tools = "sha256-1xFFGZapFq9ogGQ6ePSv4PrXl5qOAgRZWAp4mJ5uxdU="; odbc = "sha256-S6+5P4daK/+nXwoHmOkj4DIkHtwdzO5GOkCCI612bRY="; </ins> }; }.${stdenv.hostPlatform.system} or throwSystem;
sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; <del> maintainers = with maintainers; [ flokli ]; </del> <ins> maintainers = with maintainers; [ flokli dylanmtaylor ]; </ins> hydraPlatforms = [ ]; }; }
<ins> diff --git a/Cargo.lock b/Cargo.lock index f01f824..e00d079 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -328,7 +328,7 @@ dependencies = [ [[package]] name = "swayws" -version = "1.1.1" +version = "1.2.0" dependencies = [ "clap", "env_logger", </ins>
rustPlatform.buildRustPackage rec { pname = "swayws"; <del> version = "unstable-2022-03-10"; </del> <ins> version = "1.2.0"; </ins> src = fetchFromGitLab { owner = "w0lff"; repo = pname; <del> rev = "514f3c664439cf2c11bb9096c7e1d3b8c0b898a2"; sha256 = "sha256-vUnbn79v08riYLMBI8BxeBPpe/pHOWlraG7QAaohw3s="; </del> <ins> rev = "v${version}"; sha256 = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; </ins> }; <del> cargoSha256 = "sha256-PvKpcTewajvbzUHPssBahWVcAQB3V/aMmOJ/wA0Nrv4="; </del> <ins> cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo="; # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1 cargoPatches = [ ./ws-update-Cargo-lock.patch ]; </ins> # swayws does not have any tests doCheck = false;
<ins> { lib , buildPythonPackage , fetchPypi , pytestCheckHook , pythonOlder , setuptools }: buildPythonPackage rec { pname = "binary"; version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-bsAQ5Y9zMevIvJY42+bGbWNd5g1YGLByO+9N6tDsKKY="; }; nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "binary" "binary.core" ]; meta = with lib; { description = "Easily convert between binary and SI units (kibibyte, kilobyte, etc.)"; homepage = "https://github.com/ofek/binary"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ ]; }; } </ins>
<ins> { buildGoModule , fetchFromGitHub , lib , nix-update-script }: buildGoModule rec { pname = "gut"; version = "0.2.7"; src = fetchFromGitHub { owner = "julien040"; repo = "gut"; rev = version; sha256 = "sha256-qmp6QWmyharyTzUVXlX/oJZWbeyegX/u8/vzi/pTSaA="; }; vendorSha256 = "sha256-E4jr+dskBdVXj/B5RW1AKyxxr+f/+ZW42OTO9XbCLuw="; ldflags = [ "-s" "-w" "-X github.com/julien040/gut/src/telemetry.gutVersion=${version}" ]; # Checks if `/home` exists doCheck = false; passthru.updateScript = nix-update-script { }; meta = { description = "An easy-to-use git client for Windows, macOS, and Linux"; homepage = "https://github.com/slackhq/go-audit"; maintainers = [ lib.maintainers.paveloom ]; license = [ lib.licenses.mit ]; }; } </ins>
<ins> # On Mac OS X, frameworks are linked to the system CoreFoundation but # dynamic libraries built with nix use a pure version of CF this # causes segfaults for binaries that depend on it at runtime.  This # can be solved in two ways. # 1. Rewrite references to the pure CF using this setup hook, this # works for the simple case but this can still cause problems if other # dependencies (eg. python) use the pure CF. # 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to # /System/Library/Frameworks.  This will make everything load the # system's CoreFoundation framework while still keeping the # dependencies pure for other packages. fixupOutputHooks+=('fixDarwinFrameworksIn $prefix') fixDarwinFrameworks() { local systemPrefix='/System/Library/Frameworks' for fn in "$@"; do if [ -L "$fn" ]; then continue; fi echo "$fn: fixing dylib" for framework in $(otool -L "$fn" | awk '/CoreFoundation.framework/ {print $1}'); do install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2 done done } fixDarwinFrameworksIn() { local dir="$1" fixDarwinFrameworks $(find "$dir" -name "*.dylib") } </ins>
fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh; <ins> fixDarwinFrameworks = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-frameworks.sh; </ins> keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;
libusb = callPackage ../development/libraries/libusb {}; libusb1 = callPackage ../development/libraries/libusb1 { <del> inherit (darwin) libobjc IOKit; </del> <ins> inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) IOKit; </ins> }; libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
<del> diff --git a/Cargo.lock b/Cargo.lock index fb17c7e..ef157e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2332,10 +2332,10 @@ dependencies = [ [[package]] name = "magnum-opus" version = "0.4.0" -source = "git+https://github.com/open-trade/magnum-opus#3c3d0b86ae95c84930bebffe4bcb03b3bd83342b" +source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604" dependencies = [ - "bindgen", - "target_build_utils", + "libc", + "opusic-sys", ] [[package]] @@ -2796,6 +2796,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "opusic-sys" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5" +dependencies = [ + "cmake", + "libc", +] + [[package]] name = "os_str_bytes" version = "6.0.0" </del> diff --git a/Cargo.toml b/Cargo.toml index 1b715bd..960e8da 100644 --- a/Cargo.toml
./fix-for-rust-1.65.diff ]; <del> cargoSha256 = "sha256-1OMWEk+DerltF7kwdo4d04rbgIFLHBRq3vZaL7jtrdE="; LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib"; </del> <ins> LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "confy-0.4.0" = "sha256-e91cvEixhpPzIthAxzTa3fDY6eCsHUy/eZQAqs7QTDo="; "parity-tokio-ipc-0.7.3-1" = "sha256-eULJePtBu0iBI3It/bPH0h82Obsb1PJALgwYwrnCFYI="; "rdev-0.5.0-2" = "sha256-7CEZ2wIM4QAPfY1tGKqXfHplTaxHnccVqFRPjY21Svo="; "tokio-socks-0.5.1-1" = "sha256-45QQ6FrhGU9uEhbKXTKd/mY6MDumO6p46NmlakdyDQk="; "libappindicator-0.6.1" = "sha256-JGnnZrcwbh8WJ6+/4bYhfD3HvgF2C7XaaGb6TaMRWdw="; "magnum-opus-0.4.0" = "sha256-U5uuN4YolOYDnFNbtPpwYefcBDTUUyioui0UCcW8dyo="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; "sciter-rs-0.5.57" = "sha256-ZZnZDhMjK0LjgmK0da1yvB0uoKueLhhhQtzmjoN+1R0="; "systray-0.4.1" = "sha256-p1PMr/8oS6zHx4+Ng4zCqt0xZ57cq3wAu6/agyWq5Jw="; }; }; </ins> # Change magnus-opus version to upstream so that it does not use # vcpkg for libopus since it does not work.
# Manually simulate a vcpkg installation so that it can link the libaries # properly. <del> postUnpack = let vcpkg_target = "x64-linux"; updates_vcpkg_file = writeText "update_vcpkg_rustdesk" </del> <ins> postUnpack = let vcpkg_target = "x64-linux"; updates_vcpkg_file = writeText "update_vcpkg_rustdesk" '' Package : libyuv Architecture : ${vcpkg_target} Version : 1.0 Status : is installed Package : libvpx Architecture : ${vcpkg_target} Version : 1.0 Status : is installed ''; in </ins> '' <del> Package : libyuv Architecture : ${vcpkg_target} Version : 1.0 Status : is installed Package : libvpx Architecture : ${vcpkg_target} Version : 1.0 Status : is installed </del> <ins> export VCPKG_ROOT="$TMP/vcpkg"; mkdir -p $VCPKG_ROOT/.vcpkg-root mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib mkdir -p $VCPKG_ROOT/installed/vcpkg/updates ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status mkdir -p $VCPKG_ROOT/installed/vcpkg/info touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ </ins> ''; <del> in '' export VCPKG_ROOT="$TMP/vcpkg"; mkdir -p $VCPKG_ROOT/.vcpkg-root mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib mkdir -p $VCPKG_ROOT/installed/vcpkg/updates ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status mkdir -p $VCPKG_ROOT/installed/vcpkg/info touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ ''; </del> nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook ]; buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ];
# Checks require an active X display. doCheck = false; <del> desktopItems = [ (makeDesktopItem { name = "rustdesk"; exec = meta.mainProgram; icon = "rustdesk"; desktopName = "RustDesk"; comment = meta.description; genericName = "Remote Desktop"; categories = ["Network"]; }) ]; </del> <ins> desktopItems = [ (makeDesktopItem { name = "rustdesk"; exec = meta.mainProgram; icon = "rustdesk"; desktopName = "RustDesk"; comment = meta.description; genericName = "Remote Desktop"; categories = [ "Network" ]; }) ]; postPatch = '' rm Cargo.lock ln -s ${./Cargo.lock} Cargo.lock ''; </ins> # Add static ui resources and libsciter to same folder as binary so that it # can find them.
<del> { lib, buildPythonPackage, fetchFromGitHub , django }: </del> <ins> { lib , buildPythonPackage , django , fetchFromGitHub , poetry-core , python , pythonOlder , ua-parser }: </ins> buildPythonPackage rec { pname = "django-sesame"; <del> version = "1.7"; </del> <ins> version = "3.1"; format = "pyproject"; disabled = pythonOlder "3.7"; </ins> src = fetchFromGitHub { owner = "aaugustin"; repo = pname; <del> rev = version; sha256 = "0k8s44zn2jmasp0w064vrx685fn4pbmdfx8qmhkab1hd5ys6pi44"; </del> <ins> rev = "refs/tags/${version}"; hash = "sha256-Pyyhm0th0cNEkM0sd6maCnf4qELsSO82c9CQuqQdn0w="; </ins> }; <del> nativeCheckInputs = [ django ]; </del> <ins> nativeBuildInputs = [ poetry-core ]; nativeCheckInputs = [ django ua-parser ]; pythonImportsCheck = [ "sesame" ]; </ins> checkPhase = '' <del> make test </del> <ins> runHook preCheck ${python.interpreter} -m django test --settings=tests.settings runHook postCheck </ins> ''; meta = with lib; {
{ appimageTools , fetchurl , lib <del> , xorg , udev , wooting-udev-rules </del> , makeWrapper }: <del> appimageTools.wrapType2 rec { </del> <ins> let </ins> pname = "wootility"; version = "4.6.20"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; sha256 = "sha256-JodmF3TThPpXXx1eOnYmYAJ4x5Ylcf35bw3R++5/Buk="; }; <ins> in appimageTools.wrapType2 { inherit pname version src; </ins> extraInstallCommands = let contents = appimageTools.extract { inherit pname version src; };
export LC_ALL=C.UTF-8 ''; <del> multiPkgs = extraPkgs; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ ([ udev wooting-udev-rules xorg.libxkbfile ]); </del> <ins> extraPkgs = pkgs: with pkgs; ([ xorg.libxkbfile ]); </ins> <del> meta = with lib; { </del> <ins> meta = { </ins> homepage = "https://wooting.io/wootility"; description = "Customization and management software for Wooting keyboards"; <del> platforms = [ "x86_64-linux" ]; license = licenses.unfree; maintainers = with maintainers; [ davidtwco sodiboo ]; </del> <ins> platforms = lib.platforms.linux; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ davidtwco sodiboo ]; </ins> mainProgram = "wootility"; }; }
<ins> { lib , appimageTools , fetchurl }: let pname = "codux"; version = "15.4.4"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; sha256 = "sha256-6XLKXw+e/310mCQxM/X/kzok562vGjEhmF1eLfakB4Q="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications cp -r ${appimageContents}/usr/share/icons $out/share substituteInPlace $out/share/applications/${pname}.desktop  --replace 'Exec=AppRun' 'Exec=${pname}' ''; meta = with lib; { description = "A visual IDE for React"; homepage = "https://www.codux.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ dit7ya ]; }; } </ins>
sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw"; }; <del> buildInputs = [ utillinux /* provides getopt */ libcap ]; </del> <ins> # patchset from brew patches = stdenv.lib.optionals stdenv.isDarwin [ (fetchpatch { name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649"; sha256 = "1m6ggrqwqy0in264sxqk912vniipiw629dxq7kibakvsswfk6bkk"; }) (fetchpatch { name = "0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch;att=2;bug=766649"; sha256 = "0rhayp42x4i1a6yc4d28kpshmf7lrmaprq64zfrjpdn4kbs0rkln"; }) (fetchpatch { name = "fakeroot-always-pass-mode.patch"; url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20"; sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p"; }) ]; buildInputs = [ getopt ] ++ stdenv.lib.optional (!stdenv.isDarwin) libcap ; </ins> postUnpack = '' for prog in getopt; do
stdenv.mkDerivation rec { pname = "budgie-desktop"; <del> version = "10.7.1"; </del> <ins> version = "10.7.2"; </ins> src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = pname; rev = "v${version}"; fetchSubmodules = true; <del> sha256 = "sha256-ww65J9plixbxFza6xCfaz1WYtT9giKkLVH1XYxH41+0="; </del> <ins> hash = "sha256-fd3B2DMZxCI4Gb9mwdACjIPydKghXx8IkhFpMS/Clps="; </ins> }; patches = [
GEM remote: https://rubygems.org/ specs: <del> RedCloth (4.2.9) colorator (0.1) ffi (1.9.10) jekyll (3.0.1) colorator (~> 0.1) </del> <ins> RedCloth (4.3.2) addressable (2.5.0) public_suffix (~> 2.0, >= 2.0.2) colorator (1.1.0) ffi (1.9.18) forwardable-extended (2.6.0) jekyll (3.4.1) addressable (~> 2.4) colorator (~> 1.0) </ins> jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) kramdown (~> 1.3) liquid (~> 3.0) mercenary (~> 0.3.3) <ins> pathutil (~> 0.9) </ins> rouge (~> 1.7) safe_yaml (~> 1.0) <del> jekyll-sass-converter (1.4.0) sass (~> 3.4) jekyll-watch (1.3.0) listen (~> 3.0) </del> <ins> jekyll-feed (0.9.1) jekyll (~> 3.3) </ins> jekyll-paginate (1.1.0) <del> kramdown (1.9.0) </del> <ins> jekyll-sass-converter (1.5.0) sass (~> 3.4) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) kramdown (1.13.2) </ins> liquid (3.0.6) <del> listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) mercenary (0.3.5) rb-fsevent (0.9.7) rb-inotify (0.9.5) </del> <ins> listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) minima (2.1.0) jekyll (~> 3.3) pathutil (0.14.0) forwardable-extended (~> 2.6) public_suffix (2.0.5) rb-fsevent (0.9.8) rb-inotify (0.9.8) </ins> ffi (>= 0.5.0) <del> rdiscount (2.1.8) rouge (1.10.1) </del> <ins> rdiscount (2.2.0.1) rouge (1.11.1) </ins> safe_yaml (1.0.4) <del> sass (3.4.20) </del> <ins> sass (3.4.23) </ins> PLATFORMS ruby
<del> { stdenv, lib, bundlerEnv, ruby_2_2, curl }: </del> <ins> { stdenv, lib, bundlerEnv, ruby }: </ins> bundlerEnv rec { name = "jekyll-${version}"; <del> version = "3.0.1"; ruby = ruby_2_2; gemdir = ./.; </del> <ins> version = (import gemset).jekyll.version; inherit ruby; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; </ins> meta = with lib; { description = "Simple, blog aware, static site generator";
[ darwin.apple_sdk.frameworks.CoreServices ]; }; <ins> # disable bundle install as it can't install anything in addition to what is # specified in pkgs/applications/misc/jekyll/Gemfile anyway. Also do chmod_R # to compensate for read-only files in site_template in nix store. jekyll = attrs: { postInstall = '' installPath=$(cat $out/nix-support/gem-meta/install-path) sed -i $installPath/lib/jekyll/commands/new.rb  -e 's@Exec.run("bundle", "install"@Exec.run("true"@'  -e 's@FileUtils.cp_r site_template + "/.", path@FileUtils.cp_r site_template + "/.", path; FileUtils.chmod_R "u+w", path@' ''; }; </ins> # note that you need version >= v3.16.14.8, # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161
stdenv.mkDerivation rec { pname = "tracker-miners"; <del> version = "3.5.0"; </del> <ins> version = "3.5.2"; </ins> src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; <del> sha256 = "F5ZmA9xDKphSa0kFhqSKzX+fWZNfeJXfxRcppGppAaM="; </del> <ins> sha256 = "QPuR+svZRo4m6+zHEdg2Mc2K6TkcYV1o27A8vKsbbGk="; </ins> }; <ins> patches = [ # Use cc.has_header_symbol to check for BTRFS_IOC_INO_LOOKUP # https://github.com/NixOS/nixpkgs/issues/228639 (fetchpatch { url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/c08fbe0650d4a2ae915a21764f54c02eda9406d5.patch"; sha256 = "U81+yfg2sUkKl4tKMeB7pXJRNSeIE+2loT3/bvnhoKM="; }) ]; </ins> nativeBuildInputs = [ asciidoc docbook-xsl-nons
buildGoModule rec { pname = "symfony-cli"; <del> version = "5.5.6"; vendorHash = "sha256-AfgDsd4W8wV0GeymD9SLeHtOeFP9qbFy+GTdMxQSkDA="; </del> <ins> version = "5.5.7"; vendorHash = "sha256-OXV/hTSHJvYfe2SiFamkedC01J/DOgd8I60yIpQToos="; </ins> src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; <del> sha256 = "sha256-lE8RBjBXucL0DJjEnBLbHqOVE6g358rwmaEUqU6QhOw="; </del> <ins> hash = "sha256-LC6QQIVHllBRu8B6XfV8SuTB3O+FmqYr+LQnVmLj2nU="; </ins> }; ldflags = [
$GOPATH/bin/symfony-cli ''; <del> meta = with lib; { </del> <ins> meta = { </ins> description = "Symfony CLI"; homepage = "https://github.com/symfony-cli/symfony-cli"; <del> license = licenses.agpl3Plus; maintainers = with maintainers; [ drupol ]; </del> <ins> license = lib.licenses.agpl3Plus; </ins> mainProgram = "symfony"; <ins> maintainers = with lib.maintainers; [ drupol ]; </ins> }; }
<del> { lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }: </del> <ins> { lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk, testers, transcrypt }: </ins> stdenv.mkDerivation rec { pname = "transcrypt"; <del> version = "1.1.0"; </del> <ins> version = "2.2.3"; </ins> src = fetchFromGitHub { owner = "elasticdog"; repo = "transcrypt"; rev = "v${version}"; <del> sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; </del> <ins> sha256 = "+B8CYHDneDd0GwiTwQK6YVScDMKao2JXFpGk9PY6/EE="; </ins> }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ git openssl coreutils util-linux gnugrep gnused gawk ]; <del> patches = [ ./helper-scripts_depspathprefix.patch ]; </del> installPhase = '' install -m 755 -D transcrypt $out/bin/transcrypt install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1
<del> diff --git a/transcrypt b/transcrypt index a0b562d..7888f5d 100755 --- a/transcrypt +++ b/transcrypt @@ -278,6 +278,7 @@ save_helper_scripts() { cat <<-'EOF' > "${GIT_DIR}/crypt/clean" #!/usr/bin/env bash +		PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" filename=$1 # ignore empty files if [[ -s $filename ]]; then @@ -300,6 +301,7 @@ save_helper_scripts() { cat <<-'EOF' > "${GIT_DIR}/crypt/smudge" #!/usr/bin/env bash +		PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" tempfile=$(mktemp 2> /dev/null || mktemp -t tmp) trap 'rm -f "$tempfile"' EXIT cipher=$(git config --get --local transcrypt.cipher) @@ -309,6 +311,7 @@ save_helper_scripts() { cat <<-'EOF' > "${GIT_DIR}/crypt/textconv" #!/usr/bin/env bash +		PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH" filename=$1 # ignore empty files if [[ -s $filename ]]; then @@ -351,7 +354,7 @@ save_configuration() { git config merge.renormalize 'true' # add a git alias for listing encrypted files -	git config alias.ls-crypt "!git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = ":" }; /crypt$/{ print $1 }'" +	git config alias.ls-crypt "!PATH="$(transcrypt-depspathprefix 2>/dev/null)$PATH"; git ls-files | git check-attr --stdin filter | awk 'BEGIN { FS = ":" }; /crypt$/{ print $1 }'" } # display the current configuration settings </del>
<ins> { blueprint-compiler , desktop-file-utils , fetchFromGitHub , lib , libadwaita , libportal-gtk4 , meson , ninja , python3Packages , wrapGAppsHook4 }: python3Packages.buildPythonApplication rec { pname = "adwsteamgtk"; version = "0.6.9"; # built with meson, not a python format format = "other"; src = fetchFromGitHub { owner = "Foldex"; repo = "AdwSteamGtk"; rev = "v${version}"; hash = "sha256-aHJxgSb7oZTRrfFVYdLimwhSGzdRjGf7dGTRA+ANQiM="; }; buildInputs = [ libadwaita libportal-gtk4 ]; nativeBuildInputs = [ blueprint-compiler desktop-file-utils meson ninja wrapGAppsHook4 ]; propagatedBuildInputs = with python3Packages; [ packaging pygobject3 ]; meta = { description = "A simple Gtk wrapper for Adwaita-for-Steam"; homepage = "https://github.com/Foldex/AdwSteamGtk"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.reedrw ]; mainProgram = "adwaita-steam-gtk"; platforms = lib.platforms.linux; }; } </ins>
# XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share <ins> # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". # In nix, it is commonly set without containing these values, so we add them as fallback. # # [1] <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html> case ":$XDG_DATA_DIRS:" in *:/usr/local/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; esac case ":$XDG_DATA_DIRS:" in *:/usr/share:*) ;; *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;; esac </ins> # Force compilers and other tools to look in default search paths unset NIX_ENFORCE_PURITY export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1
# this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg <del> '' + lib.optionalString (lib.versionOlder version "1.78.0") '' </del> <ins> '' + lib.optionalString (lib.versionOlder version "1.78.0" && stdenv.isLinux) '' </ins> # see https://github.com/gentoo/gentoo/commit/4da5959 chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper '';
<ins> { lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "hcledit"; version = "0.2.7"; src = fetchFromGitHub { owner = "minamijoyo"; repo = pname; rev = "v${version}"; hash = "sha256-hunM29K6RgeVkY8nNNIYigCh2sTCR1OyPE+k3cmIJTU="; }; vendorHash = "sha256-KwoauyXeDMMTUgtLvz6m28nvFSl5fptZzEvwFVC3n8g="; meta = with lib; { description = "A command line editor for HCL"; homepage = "https://github.com/minamijoyo/hcledit"; license = licenses.mit; maintainers = with maintainers; [ aleksana ]; }; } </ins>