diff options
Diffstat (limited to 'pkgs')
31 files changed, 508 insertions, 223 deletions
diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index e71185f3f010b..a7425863d898d 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -1,19 +1,50 @@ -{ buildVersion, aarch64sha256, x64sha256, dev ? false }: +{ + buildVersion, + dev ? false, + aarch64sha256, + x64sha256, +}: -{ fetchurl, stdenv, lib, xorg, glib, libglvnd, glibcLocales, gtk3, cairo, pango, makeWrapper, wrapGAppsHook -, writeShellScript, common-updater-scripts, curl -, openssl_1_1, bzip2, bash, unzip, zip -, sqlite +{ + fetchurl, + stdenv, + lib, + xorg, + glib, + libglvnd, + glibcLocales, + gtk3, + cairo, + pango, + makeWrapper, + wrapGAppsHook, + writeShellScript, + common-updater-scripts, + curl, + openssl_1_1, + bzip2, + sqlite, }: let pnameBase = "sublimetext4"; packageAttribute = "sublime4${lib.optionalString dev "-dev"}"; - binaries = [ "sublime_text" "plugin_host-3.3" "plugin_host-3.8" crashHandlerBinary ]; + binaries = [ + "sublime_text" + "plugin_host-3.3" + "plugin_host-3.8" + crashHandlerBinary + ]; primaryBinary = "sublime_text"; - primaryBinaryAliases = [ "subl" "sublime" "sublime4" ]; - crashHandlerBinary = if lib.versionAtLeast buildVersion "4153" then "crash_handler" else "crash_reporter"; - downloadUrl = arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz"; + primaryBinaryAliases = [ + "subl" + "sublime" + "sublime4" + ]; + crashHandlerBinary = + if lib.versionAtLeast buildVersion "4153" then "crash_handler" else "crash_reporter"; + downloadUrl = + arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; @@ -30,7 +61,8 @@ let ] ++ lib.optionals (lib.versionAtLeast buildVersion "4145") [ sqlite ]; -in let +in +let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; version = buildVersion; @@ -39,31 +71,22 @@ in let dontStrip = true; dontPatchELF = true; - buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ zip unzip makeWrapper wrapGAppsHook ]; - - # make exec.py in Default.sublime-package use own bash with an LD_PRELOAD instead of "/bin/bash" - patchPhase = '' - runHook prePatch - - # TODO: Should not be necessary even in 3 - mkdir Default.sublime-package-fix - ( cd Default.sublime-package-fix - unzip -q ../Packages/Default.sublime-package - substituteInPlace "exec.py" --replace \ - "[\"/bin/bash\"" \ - "[\"$out/sublime_bash\"" - zip -q ../Packages/Default.sublime-package **/* - ) - rm -r Default.sublime-package-fix - - runHook postPatch - ''; + + buildInputs = [ + glib + # for GSETTINGS_SCHEMAS_PATH + gtk3 + ]; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; buildPhase = '' runHook preBuild - for binary in ${ builtins.concatStringsSep " " binaries }; do + for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${lib.makeLibraryPath neededLibraries}:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ @@ -86,10 +109,6 @@ in let mkdir -p $out cp -r * $out/ - # We can't just call /usr/bin/env bash because a relocation error occurs - # when trying to run a build from within Sublime Text - ln -s ${bash}/bin/bash $out/sublime_bash - runHook postInstall ''; @@ -116,7 +135,8 @@ in let }; }; }; -in stdenv.mkDerivation (rec { +in +stdenv.mkDerivation (rec { pname = pnameBase; version = buildVersion; @@ -124,27 +144,44 @@ in stdenv.mkDerivation (rec { ${primaryBinary} = binaryPackage; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p "$out/bin" - makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" - '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + '' - mkdir -p "$out/share/applications" - substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" - for directory in ''$${primaryBinary}/Icon/*; do - size=$(basename $directory) - mkdir -p "$out/share/icons/hicolor/$size/apps" - ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps - done - ''; + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = + '' + mkdir -p "$out/bin" + makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" + '' + + builtins.concatStringsSep "" ( + map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases + ) + + '' + mkdir -p "$out/share/applications" + + substitute \ + "''$${primaryBinary}/${primaryBinary}.desktop" \ + "$out/share/applications/${primaryBinary}.desktop" \ + --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" + + for directory in ''$${primaryBinary}/Icon/*; do + size=$(basename $directory) + mkdir -p "$out/share/icons/hicolor/$size/apps" + ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps + done + ''; passthru = { updateScript = let script = writeShellScript "${packageAttribute}-update-script" '' set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts curl ]} + PATH=${ + lib.makeBinPath [ + common-updater-scripts + curl + ] + } versionFile=$1 latestVersion=$(curl -s "${versionUrl}") @@ -161,15 +198,27 @@ in stdenv.mkDerivation (rec { update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" done ''; - in [ script versionFile ]; + in + [ + script + versionFile + ]; }; meta = with lib; { description = "Sophisticated text editor for code, markup and prose"; homepage = "https://www.sublimetext.com/"; - maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; + maintainers = with maintainers; [ + jtojnar + wmertens + demin-dmitriy + zimbatm + ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index d583467ad832c..d77a6205fc208 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -3,17 +3,17 @@ let common = opts: callPackage (import ./common.nix opts); in - { - sublime4 = common { - buildVersion = "4169"; - x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; - aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; - } {}; +{ + sublime4 = common { + buildVersion = "4169"; + x64sha256 = "jk9wKC0QgfhiHDYUcnDhsmgJsBPOUmCkyvQeI54IJJ4="; + aarch64sha256 = "/W/xGbE+8gGu1zNh6lERZrfG9Dh9QUGkYiqTzp216JI="; + } { }; - sublime4-dev = common { - buildVersion = "4168"; - dev = true; - x64sha256 = "KfW1Mh78CUBTmthHQd1s15a7GrmssSnWZ1RgaarJeag="; - aarch64sha256 = "qJ9oix1kwWN+TUb5/WSKyHcHzB+Q87XolMOhmqx1OFc="; - } {}; - } + sublime4-dev = common { + buildVersion = "4173"; + dev = true; + x64sha256 = "JEf974X+m0XaZ5x2g4o5XYkdo2A0cIZNjFLCrIgFzEA="; + aarch64sha256 = "+aVV7o59ZFwSOyV0DDNUpaq3q21bXslE+Oz/i33X+4Y="; + } { }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 204be07734c04..dce8a6d053006 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -14054,6 +14054,18 @@ final: prev: meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; + vim-matchtag = buildVimPlugin { + pname = "vim-matchtag"; + version = "2022-06-24"; + src = fetchFromGitHub { + owner = "leafOfTree"; + repo = "vim-matchtag"; + rev = "54357c00979e07d86aa12b383ddd1d6a7fbda2c2"; + sha256 = "01ar9qma2glb6wyhpafnwpf1f63v9i417hx1dzck1gi4fcz1pfqa"; + }; + meta.homepage = "https://github.com/leafOfTree/vim-matchtag/"; + }; + vim-matchup = buildVimPlugin { pname = "vim-matchup"; version = "2024-02-24"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ae13c6299be99..735a74026e20a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1184,6 +1184,7 @@ https://github.com/Yilin-Yang/vim-markbar/,, https://github.com/preservim/vim-markdown/,, https://github.com/euclio/vim-markdown-composer/,, https://github.com/mzlogin/vim-markdown-toc/,, +https://github.com/leafOfTree/vim-matchtag/,HEAD, https://github.com/andymass/vim-matchup/,, https://github.com/aquach/vim-mediawiki-editor/,HEAD, https://github.com/samoshkin/vim-mergetool/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index d2ad3d2c9e1d9..f2d9d2bde36ed 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -857,6 +857,22 @@ let }; }; + cameron.vscode-pytest = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-pytest"; + publisher = "Cameron"; + version = "0.1.1"; + sha256 = "sha256-YU37a0Q+IXusXgwf9doxXLlYiyzkizbPjjdCZFxeDaA="; + }; + meta = { + changelog = "https://github.com/cameronmaske/pytest-vscode/blob/master/CHANGELOG.md"; + description = "A Visual Studio Code extension that adds IntelliSense support for pytest fixtures"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Cameron.vscode-pytest"; + license = lib.licenses.unlicense; + maintainers = [ lib.maintainers.rhoriguchi ]; + }; + }; + christian-kohler.npm-intellisense = buildVscodeMarketplaceExtension { mktplcRef = { name = "npm-intellisense"; @@ -4831,6 +4847,22 @@ let }; }; + zainchen.json = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "json"; + publisher = "ZainChen"; + version = "2.0.2"; + sha256 = "sha256-nC3Q8KuCtn/jg1j/NaAxWGvnKe/ykrPm2PUjfsJz8aI="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ZainChen.json/changelog"; + description = "A Visual Studio Code extension for JSON support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ZainChen.json"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.rhoriguchi ]; + }; + }; + zhuangtongfa.material-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "material-theme"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 9a51c13d15800..a8443af73f44d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "fa70abd34f49d8c461165b65a4ad436a4245eb51", - "hash": "sha256-BaV+BY7jTw/6M4XmAAVSRQ9viftyaPZmG17TFgSFqOg=" + "rev": "537b5b8dcc358370f2349109004233fbeab46cfe", + "hash": "sha256-zBOF1RV2dx5zraREZm/W//8DwrRMDc/j8sx+CwTyKz0=" }, - "version": "unstable-2024-03-27" + "version": "unstable-2024-04-02" }, "fceumm": { "fetcher": "fetchFromGitHub", @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "c9fafa0ed176d1ffabae5c1a7a363d0ee276a972", - "hash": "sha256-ruqgen9X3CEY+PRZFVGNPhEDUUvH486paWphQfGCHew=", + "rev": "a0c81d2f2a393bd34caf6f15c1231ba4e2175405", + "hash": "sha256-hajTfovkSH7l6AayQyiHI7E4I/82pBhQnDSxo0BcYu0=", "fetchSubmodules": true }, - "version": "unstable-2024-03-26" + "version": "unstable-2024-04-03" }, "fmsx": { "fetcher": "fetchFromGitHub", @@ -408,10 +408,10 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "6d6d21fd9e41dab2b0e0ca0587baf3fcad18fd67", - "hash": "sha256-8pPDIxnEeeTQl160E+sg/wmchOR53pQmbhvEAXRFif0=" + "rev": "ac9d0347f5d331eb49017cd599a5e63a668b4f22", + "hash": "sha256-P5Hunw1o0C29/YsOu7tmR/oY2sbL2qTmY6RoJ56bTzI=" }, - "version": "unstable-2024-02-29" + "version": "unstable-2024-04-01" }, "mame2000": { "fetcher": "fetchFromGitHub", @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "ee777f235b99d652890dedbc94337094968869d4", - "hash": "sha256-nfoZRymtbAsXWvb8MKFHUwQr0xRk9kLRtgPC2G2iAVE=" + "rev": "f03f865af9d496965ab15b9a213691319daad9d2", + "hash": "sha256-yHVkEJYSXHeUGNFJ/zbAwNi+I4gka8Id7z+LnDkCCSM=" }, - "version": "unstable-2024-03-22" + "version": "unstable-2024-04-03" }, "mame2010": { "fetcher": "fetchFromGitHub", @@ -559,10 +559,10 @@ "src": { "owner": "libretro", "repo": "nestopia", - "rev": "2cef539e0df9ae5c8e6adf830a37f5d122bf5f05", - "hash": "sha256-OKqD99kqpIoqRUOByQ4qwAczYlIGeAn0xfTZVC5jptc=" + "rev": "efe3a052c75ad47d6e98eeffd1f3d2d4893279c2", + "hash": "sha256-sSXU+rUBJcE2gQRTqnZV8NSuBz/zWNxlZHQqoAUoigU=" }, - "version": "unstable-2024-02-18" + "version": "unstable-2024-03-29" }, "np2kai": { "fetcher": "fetchFromGitHub", @@ -630,10 +630,10 @@ "src": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "e2fb1389dc12376acb84e4993ed3b08760257252", - "hash": "sha256-h/Bjgyfp+8gx3VoxteJyXxI/z4ghyw/xdmwAGXidEkc=" + "rev": "2fb8465594a7ffb7ccbac39fdedf7c70085d7f63", + "hash": "sha256-RQU2EDcBRa6aH40JrEJ3eppjflk5++AWlOH+iGJyjFY=" }, - "version": "unstable-2024-03-25" + "version": "unstable-2024-03-29" }, "picodrive": { "fetcher": "fetchFromGitHub", @@ -651,22 +651,22 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "08db12cefaad02eaa5265283e3ad0b51eeb8a633", - "hash": "sha256-1wO/iBnyGnBx+vIlnqaihAVrth3shCvogEX9TC59GaY=", + "rev": "8445595b734301f22c6fdd57536867fea3786b58", + "hash": "sha256-3e9+PkSGZbjZ2LVY0cWRIK+TbdJ4hn8FxBjWqhsQB4o=", "fetchSubmodules": true }, - "version": "unstable-2024-03-26" + "version": "unstable-2024-04-02" }, "ppsspp": { "fetcher": "fetchFromGitHub", "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "768174e19ca80bccadc067bd2c7adc0d35fb4602", - "hash": "sha256-V66SGvOAcw5lMOBID+qnsjuvKQkt1afl8wdiscKN3Us=", + "rev": "5bead8d999717ed13f7808d3e6b88a237806899e", + "hash": "sha256-bGNlzpC3xPX5xyFyMfXbeR4q3Q9bGN/oRwFTLcgzfJM=", "fetchSubmodules": true }, - "version": "unstable-2024-03-27" + "version": "unstable-2024-04-04" }, "prboom": { "fetcher": "fetchFromGitHub", @@ -793,10 +793,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "8e8549c1c441e62c2bac0ae5a6489ba3e15412c6", - "hash": "sha256-gcIBtLpfmjPHxnixMOF/onNyIclC8sDrmgTi3zHW0Mc=" + "rev": "09be43c5060b7f23eeb413aa3d7a7021e9a6566c", + "hash": "sha256-jxvX9YAgUVe/92AbwXwgOqJmfoH7t8QxnrrGoXzjFZs=" }, - "version": "unstable-2024-03-08" + "version": "unstable-2024-04-04" }, "stella2014": { "fetcher": "fetchFromGitHub", diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 40e9c77e57a7f..58bab558db746 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,22 +2,22 @@ let versions = if stdenv.isLinux then { - stable = "0.0.46"; + stable = "0.0.47"; ptb = "0.0.76"; - canary = "0.0.323"; + canary = "0.0.326"; development = "0.0.16"; } else { - stable = "0.0.296"; - ptb = "0.0.102"; - canary = "0.0.435"; - development = "0.0.31"; + stable = "0.0.298"; + ptb = "0.0.105"; + canary = "0.0.451"; + development = "0.0.39"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-uGHDZg4vu7rUJce6SSVbuLRBPEHXgN4oocAQY+Dqdaw="; + hash = "sha256-4cELs7K7DAfzbA0/BwAkKraTD7z58jzOf1J3Our3CwM="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-jhfg66zd5oADT84RDdoBXp8n9xGd1jNaX8hDRnJKFK0="; + hash = "sha256-MxiFhd7tLvL1tBRc451qjCFZlmGM8IolckExp0sR3y8="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; @@ -35,19 +35,19 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-0bSyL/J2P1pVzv9pFTNSR3V2NkQcDTd74t8KT+WVd64="; + hash = "sha256-GlTebQ16sRgHdpB9+Jw7dn+KVZ6qIrAmWBSypTcoFmE="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-33x6M++EsRJXTbsC4BCa21Yz7cbAhsosPO1WqYq/lCY="; + hash = "sha256-X5bYO1D5eWTYh22v4R274OhjTsVv70XCyrMqeRlt0Bo="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-Jreet8EstaTAYAmQrzRaJE/b+xwgRVXIW8elEY7amvw="; + hash = "sha256-psVm0eXDHVBGNb/R0kHbvz/4ilyIg4xlOj/CwkwlvgM="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-He/9KH1oMyj9ofYSwHhdqm7jKDsvrGpPPjLED9fSq30="; + hash = "sha256-nZV9LK3eGpXK/2wQKJBn3K2Ud6uBk8aammkeE00rWx0="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index c3c7964b52a35..39157edf809ba 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -1,18 +1,49 @@ -{ buildVersion, aarch64sha256, x64sha256, dev ? false }: +{ + buildVersion, + dev ? false, + aarch64sha256, + x64sha256, +}: -{ fetchurl, lib, stdenv, xorg, glib, libGL, glibcLocales, gtk3, cairo, pango, libredirect, makeWrapper, wrapGAppsHook -, pkexecPath ? "/run/wrappers/bin/pkexec" -, writeShellScript, common-updater-scripts, curl, gnugrep, coreutils +{ + fetchurl, + lib, + stdenv, + xorg, + glib, + libGL, + glibcLocales, + gtk3, + cairo, + pango, + libredirect, + makeWrapper, + wrapGAppsHook, + pkexecPath ? "/run/wrappers/bin/pkexec", + writeShellScript, + common-updater-scripts, + curl, + gnugrep, + coreutils, }: let pnameBase = "sublime-merge"; packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}"; - binaries = [ "sublime_merge" crashHandlerBinary "git-credential-sublime" "ssh-askpass-sublime" ]; + binaries = [ + "sublime_merge" + crashHandlerBinary + "git-credential-sublime" + "ssh-askpass-sublime" + ]; primaryBinary = "sublime_merge"; - primaryBinaryAliases = [ "smerge" ]; - crashHandlerBinary = if lib.versionAtLeast buildVersion "2086" then "crash_handler" else "crash_reporter"; - downloadUrl = arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; + primaryBinaryAliases = [ + "smerge" + ]; + crashHandlerBinary = + if lib.versionAtLeast buildVersion "2086" then "crash_handler" else "crash_reporter"; + downloadUrl = + arch: "https://download.sublimetext.com/sublime_merge_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://www.sublimemerge.com/${if dev then "dev" else "download"}"; versionFile = builtins.toString ./default.nix; @@ -25,8 +56,12 @@ let curl ]; - redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; -in let + redirects = [ + "/usr/bin/pkexec=${pkexecPath}" + "/bin/true=${coreutils}/bin/true" + ]; +in +let binaryPackage = stdenv.mkDerivation rec { pname = "${pnameBase}-bin"; version = buildVersion; @@ -35,13 +70,20 @@ in let dontStrip = true; dontPatchELF = true; - buildInputs = [ glib gtk3 ]; # for GSETTINGS_SCHEMAS_PATH - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + buildInputs = [ + glib + # for GSETTINGS_SCHEMAS_PATH + gtk3 + ]; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; buildPhase = '' runHook preBuild - for binary in ${ builtins.concatStringsSep " " binaries }; do + for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${lib.makeLibraryPath neededLibraries}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ @@ -96,7 +138,8 @@ in let }; }; }; -in stdenv.mkDerivation (rec { +in +stdenv.mkDerivation (rec { pname = pnameBase; version = buildVersion; @@ -104,27 +147,45 @@ in stdenv.mkDerivation (rec { ${primaryBinary} = binaryPackage; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p "$out/bin" - makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" - '' + builtins.concatStringsSep "" (map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases) + '' - mkdir -p "$out/share/applications" - substitute "''$${primaryBinary}/${primaryBinary}.desktop" "$out/share/applications/${primaryBinary}.desktop" --replace "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" - for directory in ''$${primaryBinary}/Icon/*; do - size=$(basename $directory) - mkdir -p "$out/share/icons/hicolor/$size/apps" - ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps - done - ''; + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = + '' + mkdir -p "$out/bin" + makeWrapper "''$${primaryBinary}/${primaryBinary}" "$out/bin/${primaryBinary}" + '' + + builtins.concatStringsSep "" ( + map (binaryAlias: "ln -s $out/bin/${primaryBinary} $out/bin/${binaryAlias}\n") primaryBinaryAliases + ) + + '' + mkdir -p "$out/share/applications" + + substitute \ + "''$${primaryBinary}/${primaryBinary}.desktop" \ + "$out/share/applications/${primaryBinary}.desktop" \ + --replace-fail "/opt/${primaryBinary}/${primaryBinary}" "${primaryBinary}" + + for directory in ''$${primaryBinary}/Icon/*; do + size=$(basename $directory) + mkdir -p "$out/share/icons/hicolor/$size/apps" + ln -s ''$${primaryBinary}/Icon/$size/* $out/share/icons/hicolor/$size/apps + done + ''; passthru = { updateScript = let script = writeShellScript "${packageAttribute}-update-script" '' set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} + PATH=${ + lib.makeBinPath [ + common-updater-scripts + curl + gnugrep + ] + } versionFile=$1 latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') @@ -141,7 +202,11 @@ in stdenv.mkDerivation (rec { update-source-version "${packageAttribute}.${primaryBinary}" "$latestVersion" --file="$versionFile" --version-key=buildVersion --source-key="sources.$platform" done ''; - in [ script versionFile ]; + in + [ + script + versionFile + ]; }; meta = with lib; { @@ -150,6 +215,9 @@ in stdenv.mkDerivation (rec { maintainers = with maintainers; [ zookatron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 068e9cca20aa6..6a1cc1e5575e1 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -2,17 +2,18 @@ let common = opts: callPackage (import ./common.nix opts); -in { +in +{ sublime-merge = common { buildVersion = "2091"; aarch64sha256 = "dkPKuuzQQtL3eZlaAPeL7e2p5PCxroFRSp6Rw5wHODc="; x64sha256 = "T5g6gHgl9xGytEOsh3VuB08IrbDvMu24o/1edCGmfd4="; - } {}; + } { }; sublime-merge-dev = common { buildVersion = "2092"; + dev = true; aarch64sha256 = "3QMDynXMVB4QVtM8EPbZ8I4m+5sEjzs8XN+jEoMaktM="; x64sha256 = "S9E+wRvO41Eq+PLA/J+sjBIAn6yz715Wg9bKRW2Eobg="; - dev = true; - } {}; + } { }; } diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/by-name/au/audible-cli/package.nix index 4d0134e8eaee8..7e78e2a8d395a 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/pkgs/by-name/au/audible-cli/package.nix @@ -1,15 +1,15 @@ -{ lib, python3Packages, fetchFromGitHub, installShellFiles }: +{ lib, python3Packages, fetchFromGitHub, installShellFiles, nix-update-script }: python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.2.6"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "mkb79"; repo = "audible-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-J81RcehFokOpsQBJLvmeihSrlMyX0geHPl3PPxvGjmY="; + hash = "sha256-AYL7lcYYY7gK12Id94aHRWRlCiznnF4r+lpI5VFpAWY="; }; nativeBuildInputs = with python3Packages; [ @@ -35,7 +35,6 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "httpx" - "audible" ]; postInstall = '' @@ -53,6 +52,8 @@ python3Packages.buildPythonApplication rec { "audible_cli" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A command line interface for audible package. With the cli you can download your Audible books, cover, chapter files"; license = licenses.agpl3Only; diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 2d482956eed4a..ea3560af70397 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -29,7 +29,7 @@ let doInstallCheck = false; }); - version = "1.0.2"; + version = "1.0.3"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-JCxjmWr2+75KMPOoVybNZhy9zhhrg9BAKA8D+J6MNBc="; + hash = "sha256-fnJPqMFoWTYsPNEwbxTxO0h771vZKu+b5Ig4LJQcoRg="; }; - cargoHash = "sha256-FGB8p9ClGokYDrV0b47PnjeSlOv7p+IgThNajve3yms="; + cargoHash = "sha256-Qckh7knX3sARMHgn+39ozQj8CnfyEQV4yjJPP2+v2SM="; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/pkgs/by-name/hy/hydrapaper/package.nix b/pkgs/by-name/hy/hydrapaper/package.nix new file mode 100644 index 0000000000000..313a9ed4b8294 --- /dev/null +++ b/pkgs/by-name/hy/hydrapaper/package.nix @@ -0,0 +1,77 @@ +{ lib +, python3Packages +, fetchFromGitLab +, meson +, ninja +, glib +, pkg-config +, pandoc +, appstream +, blueprint-compiler +, gobject-introspection +, wrapGAppsHook4 +, dbus +, libadwaita +, xdg-user-dirs +}: + +python3Packages.buildPythonApplication rec { + pname = "hydrapaper"; + version = "3.3.2"; + pyproject = false; + + src = fetchFromGitLab { + owner = "gabmus"; + repo = "HydraPaper"; + rev = version; + hash = "sha256-IDaM8bM/0KH9h59523WqLKe400V5lLNyJ4faPf980Ro="; + }; + + nativeBuildInputs = [ + meson + ninja + glib + pkg-config + pandoc + appstream + blueprint-compiler + gobject-introspection + wrapGAppsHook4 + ]; + + buildInputs = [ + dbus + glib + libadwaita + ]; + + propagatedBuildInputs = with python3Packages; [ + dbus-python + pygobject3 + pillow + ]; + + # wrapGAppsHook4 propogates gtk4 -- which provides gtk4-update-icon-cache instead + preInstall = '' + substituteInPlace /build/source/meson_post_install.py \ + --replace-fail gtk-update-icon-cache gtk4-update-icon-cache + ''; + + dontWrapGApps = true; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ glib xdg-user-dirs ]} + ) + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "GNOME utility for setting different wallpapers on individual monitors"; + homepage = "https://hydrapaper.gabmus.org"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ lachrymal ]; + mainProgram = "hydrapaper"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 96a062af50a6e..f5c744e71098b 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -1,9 +1,11 @@ -{ cmake -, lib -, stdenv -, fetchFromGitHub -, gitUpdater +{ + cmake, + lib, + stdenv, + fetchFromGitHub, + gitUpdater, }: + stdenv.mkDerivation (finalAttrs: { pname = "lib60870"; version = "2.3.2"; @@ -21,15 +23,13 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = "cd lib60870-C"; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Implementation of the IEC 60870-5-101/104 protocol"; homepage = "https://libiec61850.com/"; license = licenses.gpl3Only; maintainers = with maintainers; [ stv0g ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/li/libiec61850/package.nix b/pkgs/by-name/li/libiec61850/package.nix index 890f9f746914b..c5e85c462bb39 100644 --- a/pkgs/by-name/li/libiec61850/package.nix +++ b/pkgs/by-name/li/libiec61850/package.nix @@ -1,9 +1,11 @@ -{ cmake -, lib -, stdenv -, fetchFromGitHub -, gitUpdater +{ + cmake, + lib, + stdenv, + fetchFromGitHub, + gitUpdater, }: + stdenv.mkDerivation (finalAttrs: { pname = "libiec61850"; version = "1.5.3"; @@ -19,15 +21,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Open-source library for the IEC 61850 protocols"; homepage = "https://libiec61850.com/"; license = licenses.gpl3Only; maintainers = with maintainers; [ stv0g ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; }) diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix index a90d4046d270a..7328983797761 100644 --- a/pkgs/by-name/mi/mihomo/package.nix +++ b/pkgs/by-name/mi/mihomo/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "mihomo"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "MetaCubeX"; repo = "mihomo"; rev = "v${version}"; - hash = "sha256-/4Tlv6LLT1+CHdjJ1ZlYaZj44TX5y6FEHdKk+OA1vBU="; + hash = "sha256-/fFVUI++OhOer5DrvcXO+R+4whtb5+3Qg3e4+ikJr1Y="; }; vendorHash = "sha256-k4xB/jO78VGD+n9HtuoWXoXB+kZCEyPKJTTwj32nGIw="; diff --git a/pkgs/by-name/up/upsun/package.nix b/pkgs/by-name/up/upsun/package.nix new file mode 100644 index 0000000000000..5e2d53d78667e --- /dev/null +++ b/pkgs/by-name/up/upsun/package.nix @@ -0,0 +1,34 @@ +{ stdenvNoCC, lib, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "upsun"; + version = "5.0.12"; + + src = { + x86_64-linux = fetchurl { + url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_linux_amd64.tar.gz"; + hash = "sha256-svEPMVY7r7pAoXwFIMYqCEduqR3Nkocaguf2nIGt+G8="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/platformsh/cli/releases/download/${version}/upsun_${version}_linux_arm64.tar.gz"; + hash = "sha256-ZraS/PqSPL/kcj5o6hzDdL70IV2IWXOma6OHCiXIDQc="; + }; + }.${stdenvNoCC.system} or (throw "${pname}-${version}: ${stdenvNoCC.system} is unsupported."); + + dontConfigure = true; + dontBuild = true; + + sourceRoot = "."; + installPhase = '' + install -Dm755 upsun $out/bin/upsun + ''; + + meta = { + homepage = "https://github.com/platformsh/cli"; + description = "The unified tool for managing your Upsun services from the command line"; + maintainers = with lib.maintainers; [ spk ]; + license = lib.licenses.mit; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/xo/xonsh/unwrapped.nix b/pkgs/by-name/xo/xonsh/unwrapped.nix index b0115dc247c41..e5b55efbf344b 100644 --- a/pkgs/by-name/xo/xonsh/unwrapped.nix +++ b/pkgs/by-name/xo/xonsh/unwrapped.nix @@ -90,8 +90,6 @@ python3.pkgs.buildPythonApplication { export HOME=$TMPDIR ''; - dontWrapPythonPrograms = true; - passthru = { shellPath = "/bin/xonsh"; python = python3; # To the wrapper diff --git a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix index d219e6d73b16a..f9a789c219893 100644 --- a/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/tools/deepin-gettext-tools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "deepin-gettext-tools"; - version = "1.0.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "sha256-5Dd2QU6JYwuktusssNDfA7IHa6HbFcWo9sZf5PS7NtI="; + sha256 = "sha256-V6X0E80352Vb6zwaBTRfZZnXEVCmBRbO2bca9A9OL6c="; }; postPatch = '' diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index 9e91337da7531..19fe228e35b9e 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.4.3"; + version = "5.4.4"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-yB87R6LyuTbSbQOcRi+QOhrnUy+ra76PiCzsEvPx3ds="; + hash = "sha256-8mVkVLy/E8Fl4Ds9NphtE2Hp1HLM8ehhW/dG6MlaLIs="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-XlXDof0yFxEpNCZN+4ZY2BVgpbAkwdAUJcTRxIXi8eQ="; + npmDepsHash = "sha256-Csu9Ik9aC9qvZmx9Yn1xzkrP1bjHL0o72ZSwzCicFoI="; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix index 97d62fad3ced1..42fb6edae78f2 100644 --- a/pkgs/development/libraries/mbedtls/2.nix +++ b/pkgs/development/libraries/mbedtls/2.nix @@ -1,6 +1,6 @@ { callPackage }: callPackage ./generic.nix { - version = "2.28.7"; - hash = "sha256-JI0Frbz4HkPqrLQNrSIj1ikN8201h4kd1wTwyPotERw="; + version = "2.28.8"; + hash = "sha256-A1DYZrvJ8SRujroVwqPfcTOSgLnT5xRat/RVdq2fL/o="; } diff --git a/pkgs/development/libraries/mbedtls/3.nix b/pkgs/development/libraries/mbedtls/3.nix index 267349ac5d7be..d672e218f577f 100644 --- a/pkgs/development/libraries/mbedtls/3.nix +++ b/pkgs/development/libraries/mbedtls/3.nix @@ -1,6 +1,18 @@ -{ callPackage }: +{ callPackage +, fetchpatch +}: callPackage ./generic.nix { - version = "3.5.2"; - hash = "sha256-lVGmnSYccNmRS6vfF/fDiny5cYRPc/wJBpgciFLPUvM="; + version = "3.6.0"; + hash = "sha256-tCwAKoTvY8VCjcTPNwS3DeitflhpKHLr6ygHZDbR6wQ="; + + patches = [ + # https://github.com/Mbed-TLS/mbedtls/pull/9000 + # Remove at next version update + (fetchpatch { + name = "fix-darwin-memcpy-error.patch"; + url = "https://github.com/Mbed-TLS/mbedtls/commit/b32d7ae0fee2f906be59780b42a0cd4468a39bd1.patch"; + hash = "sha256-BTkJs9NEkCl+/Q8EwB/LW9uwF95jQOKWmoCK4B/7/sU="; + }) + ]; } diff --git a/pkgs/development/libraries/mbedtls/generic.nix b/pkgs/development/libraries/mbedtls/generic.nix index 2e79a593b7c31..e87a133eb2a10 100644 --- a/pkgs/development/libraries/mbedtls/generic.nix +++ b/pkgs/development/libraries/mbedtls/generic.nix @@ -2,6 +2,7 @@ , stdenv , version , hash +, patches ? [] , fetchFromGitHub , cmake @@ -21,8 +22,12 @@ stdenv.mkDerivation rec { repo = "mbedtls"; rev = "${pname}-${version}"; inherit hash; + # mbedtls >= 3.6.0 uses git submodules + fetchSubmodules = true; }; + inherit patches; + nativeBuildInputs = [ cmake ninja perl python3 ]; strictDeps = true; diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index d6e3aa57e9866..920b8467bc99f 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -1,8 +1,8 @@ { fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tdlib"; - version = "1.8.24"; + version = "1.8.27"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "c5c55092dd61b9eb15d6bbfd0f02c04c593450e7"; - hash = "sha256-jqS3PGg42W15QBgpL1PNU3xJdk67g8u0THN/4hW5i88="; + rev = "efc6bd553b61dea0ae8c0436695e8d2539bf03f9"; + hash = "sha256-AHfuT+bLkc8Lm1B96E/kwUx1ZKStQbv/skH8woRITRk="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 2111d5fa4d6b5..0400906ea8832 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -1,24 +1,25 @@ -{ lib -, aiofiles -, aiohttp -, aioresponses -, aiounittest -, buildPythonPackage -, ciso8601 -, fetchFromGitHub -, pubnub -, pyjwt -, pytestCheckHook -, python-dateutil -, pythonOlder -, requests -, requests-mock -, setuptools +{ + lib, + aiofiles, + aiohttp, + aioresponses, + aiounittest, + buildPythonPackage, + ciso8601, + fetchFromGitHub, + pubnub, + pyjwt, + pytestCheckHook, + python-dateutil, + pythonOlder, + requests, + requests-mock, + setuptools, }: buildPythonPackage rec { pname = "yalexs"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-hY46hUUmbQUWmI+Oa9qIQ1rZdXT5daGo1Vd5JRKfDHE="; + hash = "sha256-+FdQQzQhKhIOEnOym2DNT9uQL2uAbfE8tUXUHIFFK2I="; }; postPatch = '' @@ -36,11 +37,9 @@ buildPythonPackage rec { --replace-fail '"vol",' "" ''; - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiofiles aiohttp ciso8601 @@ -60,9 +59,7 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ - "yalexs" - ]; + pythonImportsCheck = [ "yalexs" ]; meta = with lib; { description = "Python API for Yale Access (formerly August) Smart Lock and Doorbell"; diff --git a/pkgs/development/tools/go-mockery/default.nix b/pkgs/development/tools/go-mockery/default.nix index 7176bf7e3bd3b..770f4b5db181f 100644 --- a/pkgs/development/tools/go-mockery/default.nix +++ b/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.42.1"; + version = "2.42.2"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-+D91qWXv+OAZKKXllCv6cpGppzmIlwUTweN2NR/nTqU="; + sha256 = "sha256-y0HMoQvv001smvWlK1qN0bYeHgNDLz1uKQCaRmDnoM4="; }; preCheck = '' @@ -24,7 +24,7 @@ buildGoModule rec { CGO_ENABLED = false; proxyVendor = true; - vendorHash = "sha256-FCl17nywcMoXEA3l0rOzY66Pj51rEEGdK6Zo6Y3/n34="; + vendorHash = "sha256-1SzdVM1Ncpym6bPg1aSyfoAM1YiUGal3Glw0paz+buk="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index a24fa814fc026..89f062c75880d 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.22"; + version = "0.6.27"; src = fetchCrate { inherit pname version; - hash = "sha256-TlTm4pQrviKHusBBYLbpIX1dGcS4dSs1G/TfZT32CvY="; + hash = "sha256-TaXVHTUof/T+p0Zxpdf552uVqCr7jzQtNGKLKq7asqI="; }; - cargoHash = "sha256-OFzeD15m6Ie2GrRlItsqDO3QGTBWkcsvSkanbzPdne4="; + cargoHash = "sha256-qhD6PLvvfLkVr9rOB90Kw4/jDOw06h7TUe1YCjGad1g="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index e29d18aa7ffce..e4aa0b353acae 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -21,6 +21,7 @@ stdenvNoCC.mkDerivation rec { cp -av sof-tplg $out/lib/firmware/intel/sof-tplg cp -av sof-ace-tplg $out/lib/firmware/intel/sof-ace-tplg cp -av sof-ipc4 $out/lib/firmware/intel/sof-ipc4 + cp -av sof-ipc4-tplg $out/lib/firmware/intel/sof-ipc4-tplg runHook postInstall ''; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index bb6687c204730..2ae5e937b10e3 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.35.4"; + version = "1.35.7"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-9EEqwS7IKlRfE5bwxjScDX7KMCTpmbxixAznRhbaOE0="; + sha256 = "sha256-n6J6gFXdUvR1G2KmZf/k1ngeXAUbYorNFDxND+e5YIY="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-TXx+YmXsAwh2J+nHpff0oHatI6G2QY2QZmMMcHAG6Lc="; + vendorHash = "sha256-o9b+eoFCrC7oN26nyeFGMWnLtvU+Wk7e9cr38bSsKTs="; proxyVendor = true; doCheck = false; diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index ae96def578f6e..3fe4f9af4a08d 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nilfs-utils"; - version = "2.2.10"; + version = "2.2.11"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xTnd3sfBaVU4Ovcsk4oufylNpGS+5n3ZLa2GXzUbeCE="; + sha256 = "sha256-qvs0PBkMYzGfIQ/Z2Wz0aHe2Y2Ia6fA4pMSk5Jhejf4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 616ee90d9a3fd..54d0c1be4ce6b 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec { license = [ licenses.gpl3 ]; maintainers = with maintainers; [ infinisil - asymmetric hsjobeki ]; platforms = platforms.unix; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0381bfd5d00a7..5717c09857c4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1708,8 +1708,6 @@ with pkgs; arubaotp-seed-extractor = callPackage ../tools/security/arubaotp-seed-extractor { }; - audible-cli = callPackage ../tools/misc/audible-cli { }; - auditwheel = with python3Packages; toPythonApplication auditwheel; amidst = callPackage ../tools/games/minecraft/amidst { }; |