diff options
Diffstat (limited to 'pkgs')
93 files changed, 1700 insertions, 583 deletions
diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 98ac7c66dfe6d..7bc25ab058ab8 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -33,13 +33,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-59"; + version = "2.0-61"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-dw77UkhyJ+XJLYWT6adUuTd+spqNr3/ZOMLaAVWgzmc="; + hash = "sha256-oKVVBie3Q3VtsHbh0wJfdlx1YnF424hib8mFRYnbgXY="; }; patches = [ diff --git a/pkgs/applications/emulators/hercules/default.nix b/pkgs/applications/emulators/hercules/default.nix deleted file mode 100644 index 67506d36b63c1..0000000000000 --- a/pkgs/applications/emulators/hercules/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "hercules"; - version = "3.13"; - - src = fetchurl { - url = "http://downloads.hercules-390.eu/${pname}-${version}.tar.gz"; - sha256 = "0zg6rwz8ib4alibf8lygi8qn69xx8n92kbi8b3jhi1ymb32mf349"; - }; - - meta = with lib; { - homepage = "http://www.hercules-390.eu"; - description = "IBM mainframe emulator"; - longDescription = '' - Hercules is an open source software implementation of the mainframe - System/370 and ESA/390 architectures, in addition to the latest 64-bit - z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and - Mac OS X. - ''; - license = licenses.qpl; - maintainers = [ maintainers.anna328p ]; - }; -} diff --git a/pkgs/applications/emulators/yuzu/compat-list.nix b/pkgs/applications/emulators/yuzu/compat-list.nix new file mode 100644 index 0000000000000..431a2e5197e32 --- /dev/null +++ b/pkgs/applications/emulators/yuzu/compat-list.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchFromGitHub, unstableGitUpdater }: +stdenv.mkDerivation { + pname = "yuzu-compatibility-list"; + version = "unstable-2023-12-28"; + + src = fetchFromGitHub { + owner = "flathub"; + repo = "org.yuzu_emu.yuzu"; + rev = "0b9bf10851d6ad54441dc4f687d5755ed2c6f7a8"; + hash = "sha256-oWEeAhyxFO1TFH3d+/ivRf1KnNUU8y5c/7NtOzlpKXg="; + }; + + buildCommand = '' + cp $src/compatibility_list.json $out + ''; + + passthru.updateScript = unstableGitUpdater {}; +} diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index ef9c12703f242..116f12b2a963c 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -1,68 +1,22 @@ -{ branch ? "mainline" -, qt6Packages -, fetchFromGitHub -, fetchgit -, fetchurl -, fetchzip -, runCommand -, gnutar -}: - -let - sources = import ./sources.nix; - - compat-list = fetchurl { - name = "yuzu-compat-list"; - url = "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${sources.compatList.rev}/compatibility_list.json"; - hash = sources.compatList.hash; - }; - - mainlineSrc = fetchFromGitHub { - owner = "yuzu-emu"; - repo = "yuzu-mainline"; - rev = "mainline-0-${sources.mainline.version}"; - hash = sources.mainline.hash; - fetchSubmodules = true; - }; - - # The mirror repo for early access builds is missing submodule info, - # but the Windows distributions include a source tarball, which in turn - # includes the full git metadata. So, grab that and rehydrate it. - # This has the unfortunate side effect of requiring two FODs, one - # for the Windows download and one for the full repo with submodules. - eaZip = fetchzip { - name = "yuzu-ea-windows-dist"; - url = "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${sources.ea.version}/Windows-Yuzu-EA-${sources.ea.version}.zip"; - hash = sources.ea.distHash; - }; - - eaGitSrc = runCommand "yuzu-ea-dist-unpacked" { - src = eaZip; - nativeBuildInputs = [ gnutar ]; - } - '' - mkdir $out - tar xf $src/*.tar.xz --directory=$out --strip-components=1 - ''; - - eaSrcRehydrated = fetchgit { - url = eaGitSrc; - fetchSubmodules = true; - hash = sources.ea.fullHash; - }; - -in { - mainline = qt6Packages.callPackage ./generic.nix { - branch = "mainline"; - version = sources.mainline.version; - src = mainlineSrc; - inherit compat-list; - }; - - early-access = qt6Packages.callPackage ./generic.nix { - branch = "early-access"; - version = sources.ea.version; - src = eaSrcRehydrated; - inherit compat-list; +{ qt6Packages, makeScopeWithSplicing', generateSplicesForMkScope, vulkan-headers, fetchFromGitHub }: + +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "yuzuPackages"; + f = self: qt6Packages // { + compat-list = self.callPackage ./compat-list.nix {}; + nx_tzdb = self.callPackage ./nx_tzdb.nix {}; + + mainline = self.callPackage ./mainline.nix {}; + early-access = self.callPackage ./early-access {}; + + vulkan-headers = vulkan-headers.overrideAttrs(old: rec { + version = "1.3.274"; + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Headers"; + rev = "v${version}"; + hash = "sha256-SsS5VlEnhjOSu8MlIVC0d2r2EAf8QsNJPEAXNtbDOJ4="; + }; + }); }; -}.${branch} +} diff --git a/pkgs/applications/emulators/yuzu/early-access/default.nix b/pkgs/applications/emulators/yuzu/early-access/default.nix new file mode 100644 index 0000000000000..842f7c1079751 --- /dev/null +++ b/pkgs/applications/emulators/yuzu/early-access/default.nix @@ -0,0 +1,36 @@ +{ mainline, fetchzip, fetchgit, runCommand, gnutar }: +# The mirror repo for early access builds is missing submodule info, +# but the Windows distributions include a source tarball, which in turn +# includes the full git metadata. So, grab that and rehydrate it. +# This has the unfortunate side effect of requiring two FODs, one +# for the Windows download and one for the full repo with submodules. +let + sources = import ./sources.nix; + + zip = fetchzip { + name = "yuzu-ea-windows-dist"; + url = "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${sources.version}/Windows-Yuzu-EA-${sources.version}.zip"; + hash = sources.distHash; + }; + + gitSrc = runCommand "yuzu-ea-dist-unpacked" { + src = zip; + nativeBuildInputs = [ gnutar ]; + } + '' + mkdir $out + tar xf $src/*.tar.xz --directory=$out --strip-components=1 + ''; + + rehydratedSrc = fetchgit { + url = gitSrc; + fetchSubmodules = true; + hash = sources.fullHash; + }; +in mainline.overrideAttrs(old: { + pname = "yuzu-early-access"; + version = sources.version; + src = rehydratedSrc; + passthru.updateScript = ./update.sh; + meta = old.meta // { description = old.meta.description + " - early access branch"; }; +}) diff --git a/pkgs/applications/emulators/yuzu/early-access/sources.nix b/pkgs/applications/emulators/yuzu/early-access/sources.nix new file mode 100644 index 0000000000000..4f9c6a1f8d39d --- /dev/null +++ b/pkgs/applications/emulators/yuzu/early-access/sources.nix @@ -0,0 +1,7 @@ +# Generated by ./update.sh - do not update manually! +# Last updated: 2023-12-29 +{ + version = "4037"; + distHash = "sha256:0pw56hj13fm9j5nja1lhj839d88w00kcr30kygasr36w9c7yv2n7"; + fullHash = "sha256:0f42fp8z333b3k4pn8j0cp3480llvlygl5p6qfgywhq3g5hcpzpb"; +} diff --git a/pkgs/applications/emulators/yuzu/early-access/update.sh b/pkgs/applications/emulators/yuzu/early-access/update.sh new file mode 100755 index 0000000000000..0e98185bbf9a2 --- /dev/null +++ b/pkgs/applications/emulators/yuzu/early-access/update.sh @@ -0,0 +1,48 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq unzip + +set -euo pipefail + +cd "$(dirname "$(readlink -f "$0")")" + +log() { + tput bold + echo "#" "$@" + tput sgr0 +} + +oldVersion="$(nix --experimental-features nix-command eval -f sources.nix --raw version)" +newVersion="$(curl "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2)" + +if [ "$oldVersion" == "$newVersion" ]; then + log "Already up to date" + exit 0 +fi + +fetched="$(nix-prefetch-url --unpack --print-path "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${newVersion}/Windows-Yuzu-EA-${newVersion}.zip")" + +eaDistHash="$(echo "${fetched}" | head -n1)" +eaDist="$(echo "${fetched}" | tail -n1)" + +eaDistUnpacked="$(mktemp -d)" +trap 'rm -rf "$eaDistUnpacked"' EXIT + +log "Unpacking dist..." +tar xf "$eaDist"/*.tar.xz --directory="$eaDistUnpacked" --strip-components=1 + +log "Rehydrating..." +eaFullHash="$(nix-prefetch-git --fetch-submodules "$eaDistUnpacked" | jq -r '.sha256')" + +cat >sources.nix <<EOF +# Generated by ./update.sh - do not update manually! +# Last updated: $(date +%F) +{ + version = "$newVersion"; + distHash = "sha256:$eaDistHash"; + fullHash = "sha256:$eaFullHash"; +} +EOF + +if [ "${COMMIT:-0}" == "1" ]; then + git commit -m "yuzu-ea: ${oldVersion} -> ${newVersion}" ./sources.nix +fi diff --git a/pkgs/applications/emulators/yuzu/generic.nix b/pkgs/applications/emulators/yuzu/mainline.nix index a24ded8525310..6964f272553e5 100644 --- a/pkgs/applications/emulators/yuzu/generic.nix +++ b/pkgs/applications/emulators/yuzu/mainline.nix @@ -1,21 +1,18 @@ -{ version -, src -, branch -, compat-list - -, lib +{ lib , stdenv +, fetchFromGitHub +, nix-update-script , wrapQtAppsHook , alsa-lib , boost , catch2_3 , cmake +, compat-list , cpp-jwt , cubeb , discord-rpc , doxygen , enet -, fetchurl , ffmpeg , fmt , glslang @@ -29,6 +26,7 @@ , libzip , lz4 , nlohmann_json +, nx_tzdb , perl , pkg-config , python3 @@ -47,17 +45,17 @@ , zlib , zstd }: - -let - tzinfoVersion = "221202"; - tzinfo = fetchurl { - url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${tzinfoVersion}/${tzinfoVersion}.zip"; - hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; +stdenv.mkDerivation(finalAttrs: { + pname = "yuzu"; + version = "1665"; + + src = fetchFromGitHub { + owner = "yuzu-emu"; + repo = "yuzu-mainline"; + rev = "mainline-0-${finalAttrs.version}"; + hash = "sha256-xzSup1oz83GPpOGh9aJJ5YjoFX/cBI8RV6SvDYNH/zA="; + fetchSubmodules = true; }; -in stdenv.mkDerivation { - pname = "yuzu-${branch}"; - - inherit version src; nativeBuildInputs = [ cmake @@ -69,6 +67,10 @@ in stdenv.mkDerivation { ]; buildInputs = [ + # vulkan-headers must come first, so the older propagated versions + # don't get picked up by accident + vulkan-headers + alsa-lib boost catch2_3 @@ -101,7 +103,6 @@ in stdenv.mkDerivation { sndio speexdsp udev - vulkan-headers # intentionally omitted: xbyak - prefer vendored version for compatibility zlib zstd @@ -120,6 +121,8 @@ in stdenv.mkDerivation { "-DENABLE_QT_TRANSLATION=ON" # use system libraries + # NB: "external" here means "from the externals/ directory in the source", + # so "off" means "use system" "-DYUZU_USE_EXTERNAL_SDL2=OFF" "-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=OFF" @@ -145,13 +148,13 @@ in stdenv.mkDerivation { preConfigure = '' # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work. cmakeFlagsArray+=( - "-DTITLE_BAR_FORMAT_IDLE=yuzu | ${branch} ${version} (nixpkgs) {}" - "-DTITLE_BAR_FORMAT_RUNNING=yuzu | ${branch} ${version} (nixpkgs) | {}" + "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}" + "-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}" ) # provide pre-downloaded tz data mkdir -p build/externals/nx_tzdb - ln -sf ${tzinfo} build/externals/nx_tzdb/${tzinfoVersion}.zip + ln -sf ${nx_tzdb} build/externals/nx_tzdb/${nx_tzdb.version}.zip ''; # This must be done after cmake finishes as it overwrites the file @@ -159,12 +162,14 @@ in stdenv.mkDerivation { ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex" "mainline-0-(.*)" ]; + }; meta = with lib; { homepage = "https://yuzu-emu.org"; changelog = "https://yuzu-emu.org/entry"; - description = "The ${branch} branch of an experimental Nintendo Switch emulator written in C++"; + description = "An experimental Nintendo Switch emulator written in C++"; longDescription = '' An experimental Nintendo Switch emulator written in C++. Using the mainline branch is recommended for general usage. @@ -185,4 +190,4 @@ in stdenv.mkDerivation { k900 ]; }; -} +}) diff --git a/pkgs/applications/emulators/yuzu/nx_tzdb.nix b/pkgs/applications/emulators/yuzu/nx_tzdb.nix new file mode 100644 index 0000000000000..faca41e24737e --- /dev/null +++ b/pkgs/applications/emulators/yuzu/nx_tzdb.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, gitUpdater }: +stdenv.mkDerivation rec { + pname = "nx_tzdb"; + version = "221202"; + + src = fetchurl { + url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${version}/${version}.zip"; + hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; + }; + + dontUnpack = true; + + buildCommand = '' + cp $src $out + ''; + + passthru.updateScript = gitUpdater { + url = "https://github.com/lat9nq/tzdb_to_nx.git"; + }; +} diff --git a/pkgs/applications/emulators/yuzu/sources.nix b/pkgs/applications/emulators/yuzu/sources.nix deleted file mode 100644 index 4952c74ac4b48..0000000000000 --- a/pkgs/applications/emulators/yuzu/sources.nix +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by ./update.sh - do not update manually! -# Last updated: 2023-12-14 -{ - compatList = { - rev = "fc974b6e78105774dae5f68e712a6beb51b9db1e"; - hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; - }; - - mainline = { - version = "1651"; - hash = "sha256:00cxyh3d18k17g982yqcbaq4b6bgs4kji0yz6i15h066aj15dimy"; - }; - - ea = { - version = "4019"; - distHash = "sha256:1qd953bl216yxmaa6y0iil6pn2pn53k87qwagbmcd4l5h4aaqi7h"; - fullHash = "sha256:0na96hqfdd40q6drrlgak4qdsxs3wfizxhb8kf8qrbai3qfpx00v"; - }; -} diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh deleted file mode 100755 index ad34bfee3d6b3..0000000000000 --- a/pkgs/applications/emulators/yuzu/update.sh +++ /dev/null @@ -1,66 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq unzip - -set -euo pipefail - -cd "$(dirname "$(readlink -f "$0")")" - -log() { - tput bold - echo "#" "$@" - tput sgr0 -} - -alias curl='curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"}' - -log "Updating compatibility list..." -compatListRev="$(curl "https://api.github.com/repos/flathub/org.yuzu_emu.yuzu/commits/master" | jq -r '.sha')" - -log "Downloading rev: ${compatListRev}" -compatListHash="$(nix-prefetch-url "https://raw.githubusercontent.com/flathub/org.yuzu_emu.yuzu/${compatListRev}/compatibility_list.json")" - -log "Updating mainline..." -mainlineVersion="$(curl "https://api.github.com/repos/yuzu-emu/yuzu-mainline/releases?per_page=1" | jq -r '.[0].name' | cut -d" " -f2)" - -log "Downloading version: ${mainlineVersion}" -mainlineHash="$(nix-prefetch-git --fetch-submodules --rev "mainline-0-${mainlineVersion}" "https://github.com/yuzu-emu/yuzu-mainline" | jq -r '.sha256')" - -log "Updating early access..." -eaVersion="$(curl "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2)" - -log "Downloading dist version: ${eaVersion}" -fetched="$(nix-prefetch-url --unpack --print-path "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${eaVersion}/Windows-Yuzu-EA-${eaVersion}.zip")" - -eaDistHash="$(echo "${fetched}" | head -n1)" -eaDist="$(echo "${fetched}" | tail -n1)" - -eaDistUnpacked="$(mktemp -d)" -trap 'rm -rf "$eaDistUnpacked"' EXIT - -log "Unpacking dist..." -tar xf "$eaDist"/*.tar.xz --directory="$eaDistUnpacked" --strip-components=1 - -log "Rehydrating..." -eaFullHash="$(nix-prefetch-git --fetch-submodules "$eaDistUnpacked" | jq -r '.sha256')" - -cat >sources.nix <<EOF -# Generated by ./update.sh - do not update manually! -# Last updated: $(date +%F) -{ - compatList = { - rev = "$compatListRev"; - hash = "sha256:$compatListHash"; - }; - - mainline = { - version = "$mainlineVersion"; - hash = "sha256:$mainlineHash"; - }; - - ea = { - version = "$eaVersion"; - distHash = "sha256:$eaDistHash"; - fullHash = "sha256:$eaFullHash"; - }; -} -EOF diff --git a/pkgs/applications/graphics/inkscape/extensions.nix b/pkgs/applications/graphics/inkscape/extensions.nix index 48eb1f1f94b7b..4499792cbbd01 100644 --- a/pkgs/applications/graphics/inkscape/extensions.nix +++ b/pkgs/applications/graphics/inkscape/extensions.nix @@ -44,6 +44,7 @@ mkdir -p $out/share/inkscape/extensions cp ${inkcut}/share/inkscape/extensions/* $out/share/inkscape/extensions ''); + silhouette = callPackage ./extensions/silhouette { }; textext = callPackage ./extensions/textext { pdflatex = texlive.combined.scheme-basic; lualatex = texlive.combined.scheme-basic; diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix new file mode 100644 index 0000000000000..988b1ac3e9c8e --- /dev/null +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix @@ -0,0 +1,91 @@ +{ fetchFromGitHub +, lib +, gettext +, pkgs +, python3 +, umockdev +, writeScript +}: + +let + # We need these simple wrapper shell scripts because Inkscape extensions with + # interpreter="shell" always get invoked with the `sh` command [0], regardless of + # the shebang at the top of the script. + # [0]: https://gitlab.com/inkscape/inkscape/-/blob/d61d917afb94721c92a650b2c4b116b0a4826f41/src/extension/implementation/script.cpp#L93 + launch-sendto_silhouette = writeScript "sendto_silhouette.sh" '' + cd $(dirname $0) + ./sendto_silhouette.py "$@" + ''; + launch-silhouette_multi = writeScript "silhouette_multi.sh" '' + cd $(dirname $0) + ./silhouette_multi.py "$@" + ''; +in +python3.pkgs.buildPythonApplication rec { + pname = "inkscape-silhouette"; + version = "1.28"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "fablabnbg"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-uNVhdkZFadL7QNlCsXq51TbhzRKH9KYDPDNCFhw3cQs="; + }; + + patches = [ + ./interpreter.patch + ./use-prefix-for-udev.patch + ]; + + propagatedBuildInputs = [ + python3.pkgs.pyusb + python3.pkgs.lxml + python3.pkgs.inkex + python3.pkgs.matplotlib + python3.pkgs.wxPython_4_2 + python3.pkgs.xmltodict + ]; + + nativeBuildInputs = [ + gettext # msgfmt + ]; + + nativeCheckInputs = [ + python3.pkgs.pytestCheckHook + umockdev + ]; + + pytestFlagsArray = [ + "test" + ]; + + doCheck = true; + + installPhase = '' + runHook preInstall + make install PREFIX=$out + runHook postInstall + ''; + + postInstall = '' + # Unmark read_dump.py as executable so wrapPythonProgramsIn won't turn it + # into a shell script (thereby making it impossible to import as a Python + # module). + chmod -x $out/share/inkscape/extensions/silhouette/read_dump.py + cp ${launch-sendto_silhouette} $out/share/inkscape/extensions/sendto_silhouette.sh + cp ${launch-silhouette_multi} $out/share/inkscape/extensions/silhouette_multi.sh + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/share/inkscape/extensions/" "$out $pythonPath" + ''; + + meta = with lib; { + description = "An extension to drive Silhouette vinyl cutters (e.g. Cameo, Portrait, Curio series) from within Inkscape."; + homepage = "https://github.com/fablabnbg/inkscape-silhouette"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ jfly ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/interpreter.patch b/pkgs/applications/graphics/inkscape/extensions/silhouette/interpreter.patch new file mode 100644 index 0000000000000..1b9f7c3ebaa45 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/interpreter.patch @@ -0,0 +1,24 @@ +diff --git a/sendto_silhouette.inx b/sendto_silhouette.inx +index 55a3278..d780730 100644 +--- a/sendto_silhouette.inx ++++ b/sendto_silhouette.inx +@@ -188,6 +188,6 @@ Always use the least amount of blade possible. + </effect> + + <script> +- <command location="inx" interpreter="python">sendto_silhouette.py</command> ++ <command location="inx" interpreter="shell">sendto_silhouette.sh</command> + </script> + </inkscape-extension> +diff --git a/silhouette_multi.inx b/silhouette_multi.inx +index f6fd2ed..2d9dba6 100644 +--- a/silhouette_multi.inx ++++ b/silhouette_multi.inx +@@ -31,6 +31,6 @@ + </effect> + + <script> +- <command location="inx" interpreter="python">silhouette_multi.py</command> ++ <command location="inx" interpreter="shell">silhouette_multi.sh</command> + </script> + </inkscape-extension> diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/use-prefix-for-udev.patch b/pkgs/applications/graphics/inkscape/extensions/silhouette/use-prefix-for-udev.patch new file mode 100644 index 0000000000000..3e2d1ecfe9051 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/use-prefix-for-udev.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 5aff25d..43c3fb0 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,7 @@ VERS=$$(python3 ./sendto_silhouette.py --version) + + DEST=$(DESTDIR)$(PREFIX)/share/inkscape/extensions + LOCALE=$(DESTDIR)$(PREFIX)/share/locale +-UDEV=$(DESTDIR)/lib/udev ++UDEV=$(DESTDIR)$(PREFIX)/lib/udev + INKSCAPE_TEMPLATES=$(DESTDIR)$(PREFIX)/share/inkscape/templates + + # User-specifc inkscape extensions folder for local install diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index c049458808a5e..bb7ccd3e1896a 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -20,13 +20,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "textext"; - version = "1.8.1"; + version = "1.10.1"; src = fetchFromGitHub { owner = "textext"; repo = "textext"; rev = version; - sha256 = "sha256-Qzd39X0X3DdwZ3pIIGvEbNjl6dxjDf3idzjwCkp3WRg="; + sha256 = "sha256-FbUfZfVOYEyQVL1YMyNwb/sIUxJ+VhevatjuJI/ocIw="; }; patches = [ diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix index 8e9852334e209..d9265b2d1135a 100644 --- a/pkgs/applications/misc/clipqr/default.nix +++ b/pkgs/applications/misc/clipqr/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "clipqr"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${version}"; - hash = "sha256-OQ45GV+bViIejGC03lAuvw/y8v1itA+6pFC4H/qL744="; + hash = "sha256-gfKCuTZY9VsiXMlw6XX6YylMO4xGoLQU/5QvnDV7GbE="; }; vendorHash = null; diff --git a/pkgs/applications/misc/elf-dissector/default.nix b/pkgs/applications/misc/elf-dissector/default.nix index cae1b7b4d8850..588dd7539b7e4 100644 --- a/pkgs/applications/misc/elf-dissector/default.nix +++ b/pkgs/applications/misc/elf-dissector/default.nix @@ -1,24 +1,26 @@ { lib , stdenv -, fetchgit +, fetchFromGitLab , cmake +, elfutils , extra-cmake-modules -, wrapQtAppsHook , kitemmodels , libiberty -, libelf , libdwarf , libopcodes +, wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "elf-dissector"; - version = "unstable-2023-06-06"; + version = "unstable-2023-12-24"; - src = fetchgit { - url = "https://invent.kde.org/sdk/elf-dissector.git"; - rev = "de2e80438176b4b513150805238f3333f660718c"; - hash = "sha256-2yHPVPu6cncXhFCJvrSodcRFVAxj4vn+e99WhtiZniM="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "sdk"; + repo = "elf-dissector"; + rev = "613538bd1d87ce72d5115646551a49cf7ff2ee34"; + hash = "sha256-fQFGFw8nZHMs8J1W2CcHAJCdcvaY2l2/CySyBSsKpyE="; }; patches = [ @@ -27,12 +29,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; - buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; + buildInputs = [ kitemmodels libiberty elfutils libopcodes libdwarf ]; meta = with lib; { homepage = "https://invent.kde.org/sdk/elf-dissector"; description = "Tools for inspecting, analyzing and optimizing ELF files"; license = licenses.gpl2; - maintainers = with maintainers; [ ehmry ]; + maintainers = with maintainers; [ ehmry philiptaron ]; }; } diff --git a/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff b/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff index 3edb17201808f..ccc31c45ccdee 100644 --- a/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff +++ b/pkgs/applications/misc/elf-dissector/fix_build_for_src_lib_disassembler_disassembler.diff @@ -1,12 +1,16 @@ diff --git a/src/lib/disassmbler/disassembler.cpp b/src/lib/disassmbler/disassembler.cpp -index 3277544..e77ffc4 100644 +index 8ff058e..dbd4bbe 100644 --- a/src/lib/disassmbler/disassembler.cpp +++ b/src/lib/disassmbler/disassembler.cpp -@@ -127,7 +127,7 @@ QString Disassembler::disassembleBinutils(const unsigned char* data, uint64_t si +@@ -144,11 +144,7 @@ QString Disassembler::disassembleBinutils(const unsigned char* data, uint64_t si QString result; disassembler_ftype disassemble_fn; disassemble_info info; +-#if BINUTILS_VERSION >= BINUTILS_VERSION_CHECK(2, 39) +- INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, fprintf_styled); +-#else - INIT_DISASSEMBLE_INFO(info, &result, qstring_printf); +-#endif + INIT_DISASSEMBLE_INFO(info, &result, qstring_printf, qstring_printf); info.application_data = this; diff --git a/pkgs/applications/misc/jiten/cookie-fix.patch b/pkgs/applications/misc/jiten/cookie-fix.patch new file mode 100644 index 0000000000000..0a67c8a4e5e91 --- /dev/null +++ b/pkgs/applications/misc/jiten/cookie-fix.patch @@ -0,0 +1,39 @@ +diff --git a/jiten/app.py b/jiten/app.py +index 6d54020..f30a1d8 100644 +--- a/jiten/app.py ++++ b/jiten/app.py +@@ -149,13 +149,22 @@ True + >>> d.index("JLPT N3") < d.index("æ¯", d.index("JLPT N5")) < d.index("JLPT N2") + True + +->>> sorted( (c.name, c.value) for c in client.cookie_jar ) ++>>> def cookies(): ++... import importlib.metadata ++... v = tuple(map(int, importlib.metadata.version("werkzeug").split("."))) ++... if v < (2, 3): ++... return sorted( (c.name, c.value) for c in client.cookie_jar ) ++... else: ++... cookies = [ client.get_cookie(k) for k in PREFS ] ++... return sorted( (c.key, c.value) for c in cookies if c is not None ) ++ ++>>> cookies() + [] + >>> p = dict(dark = "yes", lang = "eng ger oops".split()) + >>> r = client.post("/_save_prefs", data = p, follow_redirects = True) + >>> r.status + '200 OK' +->>> sorted( (c.name, c.value) for c in client.cookie_jar ) ++>>> cookies() + [('dark', 'yes'), ('lang', '"eng ger"'), ('large', 'no'), ('max', '50'), ('nogrid', 'no'), ('nor2h', 'no'), ('roma', 'no')] + + """ # }}}1 +@@ -168,8 +177,7 @@ import kanjidraw + import click, flask, jinja2, werkzeug + + os.environ["FLASK_SKIP_DOTENV"] = "yes" # FIXME +-from flask import Flask, abort, escape, make_response, redirect, \ +- request, render_template, url_for ++from flask import Flask, abort, make_response, redirect, request, render_template, url_for + + from .version import __version__, py_version + from .kana import kana2romaji diff --git a/pkgs/applications/misc/jiten/default.nix b/pkgs/applications/misc/jiten/default.nix index 7a3326bc8d9eb..381e1a33718df 100644 --- a/pkgs/applications/misc/jiten/default.nix +++ b/pkgs/applications/misc/jiten/default.nix @@ -27,6 +27,12 @@ python3.pkgs.buildPythonApplication rec { sha256 = "16sz8i0sw7ggy6kijcx4qyl2zr6xj789x4iav0yyllx12dfgp5b1"; }; + patches = [ + # Potentially can be dropped after the next release + # https://github.com/NixOS/nixpkgs/issues/271600 + ./cookie-fix.patch + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pcre sqlite ]; propagatedBuildInputs = with python3.pkgs; [ click flask kanjidraw ]; diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index 17f03c787d94b..9f2d6743c3870 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -1,25 +1,19 @@ -{ lib, buildGoModule, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "writefreely"; - version = "0.13.2"; + version = "0.14.0"; src = fetchFromGitHub { - owner = "writeas"; + owner = "writefreely"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GnuqYgiwXdKM+os5RzuUYe9ADOhZaxou5dD7GCEE1Ns="; + sha256 = "sha256-vOoTAr33FMQaHIwpwIX0g/KJWQvDn3oVJg14kEY6FIQ="; }; - vendorHash = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; + vendorHash = "sha256-xTo/zbz9pSjvNntr5dnytiJ7oRAdtEuyiu4mJZgwHTc="; - nativeBuildInputs = [ go-bindata ]; - - preBuild = '' - make assets - ''; - - ldflags = [ "-s" "-w" "-X github.com/writeas/writefreely.softwareVer=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/writefreely/writefreely.softwareVer=${version}" ]; tags = [ "sqlite" ]; @@ -27,8 +21,8 @@ buildGoModule rec { meta = with lib; { description = "Build a digital writing community"; - homepage = "https://github.com/writeas/writefreely"; + homepage = "https://github.com/writefreely/writefreely"; license = licenses.agpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ soopyc ]; }; } diff --git a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix index b9ba40a2932e4..0c8d8fb24eddf 100644 --- a/pkgs/applications/networking/browsers/misc/widevine-cdm.nix +++ b/pkgs/applications/networking/browsers/misc/widevine-cdm.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "widevine-cdm"; - version = "4.10.2557.0"; + version = "4.10.2710.0"; src = fetchzip { url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - hash = "sha256-XxTjuPjWy06SmHC6GaIVIp3zD76isCVATWwwdZljntE="; + hash = "sha256-lGTrSzUk5FluH1o4E/9atLIabEpco3C3gZw+y6H6LJo="; stripRoot = false; }; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 124431b8dfc48..b43e4c70b3aef 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.30.4"; + version = "0.30.6"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-P06hKqVu/aUttjwdFVCvzC80WWbQn94bXk3LVl/97yw="; + hash = "sha256-ro2gm3EYput9l0CCfSPeRB/mTtEXlGIcZ00H0pCtQi8="; }; ldflags = [ diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 3a9e2db3ecd88..30c1617839440 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imapfilter"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-nHKZ3skRbDhKWocaw5mbaRnZC37FxFIVd08iFgrEA0s="; + sha256 = "sha256-pYnv9slw4bRPfCnhd/tlJC9JEx+3h40nyZ3qUll7p6c="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 714feb8ab495e..1df9a4bbd0281 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.26.3"; + version = "1.26.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-HjMcNZ+VV5PdTIW3q6Ja/gFIZl6xXDxk0pUCyIX4dPM="; + hash = "sha256-kQXojI57NYZgu3qXjtOL/a48YnXhuA6FEazhJ7jntqk="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 1e92978fb0cc1..7cb0127706953 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -21,13 +21,13 @@ }: let - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-jD0dRgU/9gtNZUuTV+zkjqWb8gBnvD/AOTPucdaVKwE="; + hash = "sha256-ds/hQ0+poUTO2bnXiHvNUanVFJcxxyuW3a9Yxcq5cAg="; }; python = python3; @@ -52,7 +52,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-K7wTYGGwEhPoXdRD+4swhSlMH0iem6YkF0tjnVHh7K8="; + npmDepsHash = "sha256-o/inxHiOeMhQvZVcy6CM3Jy8B2sSp+8WJBknp3KVbZM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/video/mpv/scripts/buildLua.nix b/pkgs/applications/video/mpv/scripts/buildLua.nix index 37690d9874300..0027fa722596a 100644 --- a/pkgs/applications/video/mpv/scripts/buildLua.nix +++ b/pkgs/applications/video/mpv/scripts/buildLua.nix @@ -36,6 +36,9 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy dontBuild = true; preferLocalBuild = true; + # Prevent `patch` from emitting `.orig` files (that end up in the output) + patchFlags = [ "--no-backup-if-mismatch" "-p1" ]; + outputHashMode = "recursive"; installPhase = '' runHook preInstall @@ -51,7 +54,7 @@ lib.makeOverridable (args: stdenvNoCC.mkDerivation (extendedBy exit 1 } mkdir -p "${scriptsDir}" - cp -a "${scriptPath}" "${scriptsDir}/${lib.removeSuffix ".lua" scriptName}" + cp -a "${scriptPath}" "${scriptsDir}/${scriptName}" else install -m644 -Dt "${scriptsDir}" \ ${escapedList ([ scriptPath ] ++ extraScripts)} diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index c164bae1495db..ec25801edd221 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -2,13 +2,13 @@ buildLua rec { pname = "mpv-playlistmanager"; - version = "unstable-2023-08-09"; + version = "unstable-2023-11-28"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "e479cbc7e83a07c5444f335cfda13793681bcbd8"; - sha256 = "sha256-Nh4g8uSkHWPjwl5wyqWtM+DW9fkEbmCcOsZa4eAF6Cs="; + rev = "579490c7ae1becc129736b7632deec4f3fb90b99"; + hash = "sha256-swOtoB8UV/HPTpQRGXswAfUYsyC2Nj/QRIkGP8X1jk0="; }; postPatch = '' diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 35f5fcb549f1d..077b8f0590b28 100644 --- a/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -1,7 +1,7 @@ -{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, python3, nix-update-script }: +{ lib, buildLua, fetchFromGitHub, fetchpatch, python3, nix-update-script }: # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` -stdenvNoCC.mkDerivation { +buildLua { pname = "mpv_sponsorblock"; version = "unstable-2023-01-30"; @@ -12,8 +12,6 @@ stdenvNoCC.mkDerivation { sha256 = "sha256-iUXaTWWFEdxhxClu2NYbQcThlvYty3A2dEYGooeAVAQ="; }; - dontBuild = true; - patches = [ # Use XDG_DATA_HOME and XDG_CACHE_HOME if defined for UID and DB # Necessary to avoid sponsorblock to write in the nix store at runtime. @@ -34,23 +32,16 @@ stdenvNoCC.mkDerivation { --replace 'mp.find_config_file("scripts")' "\"$out/share/mpv/scripts\"" ''; - installPhase = '' - mkdir -p $out/share/mpv/scripts - cp -r sponsorblock.lua sponsorblock_shared $out/share/mpv/scripts/ - ''; + postInstall = "cp -a sponsorblock_shared $out/share/mpv/scripts/"; - passthru = { - scriptName = "sponsorblock.lua"; - updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; - }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; }; meta = with lib; { description = "Script for mpv to skip sponsored segments of YouTube videos"; homepage = "https://github.com/po5/mpv_sponsorblock"; license = licenses.gpl3; - platforms = platforms.all; maintainers = with maintainers; [ pacien ]; }; } diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix new file mode 100644 index 0000000000000..2d07d215d0f6b --- /dev/null +++ b/pkgs/by-name/ar/armitage/package.nix @@ -0,0 +1,145 @@ +{ lib +, stdenv +, fetchurl +, fetchFromGitHub +, jdk11 +, gradle_6 +, perl +, metasploit +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, writeDarwinBundle +}: + +let + pname = "armitage"; + version = "unstable-2022-12-05"; + + src = fetchFromGitHub { + owner = "r00t0v3rr1d3"; + repo = "armitage"; + rev = "991244e9a0c0fc9302e48c4e708347c315f78b13"; + hash = "sha256-0ik20wzE0cf6cC/HY6RwMHqkvqPFpZmOUyZyb5H3SHg="; + }; + + patches = [ + (fetchurl { + name = "Remove-mentions-of-old-metasploit-versions.patch"; + url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/Remove-mentions-of-old-metasploit-versions.patch"; + hash = "sha256-VUey/e8kcBWqAxYTfIXoyTAoDR/UKZKqBJAKmdabArY="; + }) + (fetchurl { + name = "Update-postgresql-version-to-support-scram-sha-256.patch"; + url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/Update-postgresql-version-to-support-scram-sha-256.patch"; + hash = "sha256-ZPvcRoUCrq32g0Mw8+EhNl8DlI+jMYUlFyPW1VScgzc="; + }) + (fetchurl { + name = "fix-launch-script.patch"; + url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/fix-launch-script.patch"; + hash = "sha256-I6T7iwShQLn+ZHuKa117VOlItXjY4/51RDbjvNJEW/4="; + }) + (fetchurl { + name = "fix-meterpreter.patch"; + url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/fix-meterpreter.patch"; + hash = "sha256-p4fs5xFdC2apW0U8x8u9S4p5gq3Eiv+0E4CGccQZYKY="; + }) + ]; + + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit version src patches; + nativeBuildInputs = [ gradle_6 perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon assemble + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + rm -rf $out/tmp + ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "sha256-6o3HlBfmpjpmMeiRydOme6fJc8caq8EBRVf3nJq9vqo="; + }; +in +stdenv.mkDerivation (finalAttrs: { + inherit pname version src patches; + + __darwinAllowLocalNetworking = true; + + desktopItems = [ + (makeDesktopItem { + name = "armitage"; + desktopName = "Armitage"; + exec = "armitage"; + icon = "armitage"; + comment = finalAttrs.meta.description; + categories = [ "Network" "Security" ]; + startupNotify = false; + }) + ]; + + nativeBuildInputs = [ + jdk11 + gradle_6 + makeWrapper + copyDesktopItems + ] ++ lib.optionals stdenv.isDarwin [ + writeDarwinBundle + ]; + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + substituteInPlace armitage/build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' + substituteInPlace cortana/build.gradle \ + --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' + gradle --offline --no-daemon assemble + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + JAR="$out/share/armitage/armitage.jar" + install -Dm444 build/armitage.jar $JAR + + install -Dm755 dist/unix/armitage $out/bin/armitage + substituteInPlace $out/bin/armitage \ + --replace "armitage.jar" "$JAR" + wrapProgram $out/bin/armitage \ + --prefix PATH : "${lib.makeBinPath [ jdk11 metasploit ]}" + + install -Dm755 dist/unix/teamserver $out/bin/teamserver + substituteInPlace $out/bin/teamserver \ + --replace "armitage.jar" "$JAR" + wrapProgram $out/bin/teamserver \ + --prefix PATH : "${lib.makeBinPath [ jdk11 metasploit ]}" + + install -Dm444 dist/unix/armitage-logo.png $out/share/pixmaps/armitage.png + ${lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications/Armitage.app/Contents/MacOS" + mkdir -p "$out/Applications/Armitage.app/Contents/Resources" + cp dist/mac/Armitage.app/Contents/Resources/macIcon.icns $out/Applications/Armitage.app/Contents/Resources + write-darwin-bundle $out Armitage armitage macIcon + ''} + + runHook postInstall + ''; + + meta = with lib; { + description = "Graphical cyber attack management tool for Metasploit"; + homepage = "https://github.com/r00t0v3rr1d3/armitage"; + license = licenses.bsd3; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + mainProgram = "armitage"; + }; +}) diff --git a/pkgs/by-name/do/door-knocker/package.nix b/pkgs/by-name/do/door-knocker/package.nix new file mode 100644 index 0000000000000..30e78a72ddd23 --- /dev/null +++ b/pkgs/by-name/do/door-knocker/package.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitea +, blueprint-compiler +, desktop-file-utils +, glib +, gtk4 +, libadwaita +, meson +, ninja +, pkg-config +, wrapGAppsHook4 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "door-knocker"; + version = "0.4.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "tytan652"; + repo = "door-knocker"; + rev = finalAttrs.version; + hash = "sha256-9kCEPo+rlR344uPGhuWxGq6dAPgyCFEQ1XPGkLfp/bA="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + desktop-file-utils + blueprint-compiler + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = with lib; { + description = "Tool to check the availability of portals"; + homepage = "https://codeberg.org/tytan652/door-knocker"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ symphorien ]; + platforms = platforms.linux; + mainProgram = "door-knocker"; + }; +}) diff --git a/pkgs/by-name/he/hercules/package.nix b/pkgs/by-name/he/hercules/package.nix new file mode 100644 index 0000000000000..080d3a849beb4 --- /dev/null +++ b/pkgs/by-name/he/hercules/package.nix @@ -0,0 +1,153 @@ +{ lib +, stdenv +, fetchFromGitHub +, runCommand +, libtool +, cmake +, zlib +, bzip2 +, enableRexx ? stdenv.isLinux, regina +}: +let + herculesCpu = + if stdenv.hostPlatform.isx86 then "x86" + else stdenv.hostPlatform.qemuArch; + herculesBits = if stdenv.hostPlatform.is32bit then "32" else "64"; + + herculesLibDir = + if stdenv.hostPlatform.isx86 then "lib" + else "lib/${herculesCpu}"; + + mkExtPkg = depName: attrFn: (stdenv.mkDerivation { + pname = "hercules-${depName}"; + + postPatch = '' + patchShebangs build + sed -i build \ + -e "s%_tool=.*$%_tool=${cmake}/bin/cmake%" \ + -e "s/CPUS=.*$/CPUS=$NIX_BUILD_CORES/" + ''; + + dontUseCmakeConfigure = true; + + buildPhase = '' + mkdir ../build $out + # In source builds are not allowed. + cd ../build + ../source/build \ + --pkgname ${depName} \ + --cpu ${herculesCpu} \ + --arch ${herculesBits} \ + --install "$out" + ''; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with lib; { + description = "Hercules ${depName} library"; + license = lib.licenses.free; # Mixture of Public Domain, ICU (MIT compatible) and others + maintainers = with maintainers; [ anna328p vifino ]; + }; + }).overrideAttrs (default: attrFn default); + + + crypto = mkExtPkg "crypto" (default: { + version = "1.0.0"; + src = fetchFromGitHub { + owner = "SDL-Hercules-390"; + repo = "crypto"; + rev = "a5096e5dd79f46b568806240c0824cd8cb2fcda2"; + hash = "sha256-VWjM8WxPMynyW49Z8U/r6SsF7u7Xbk7Dd0gR35lIw28="; + }; + }); + + decNumber = mkExtPkg "decNumber" (default: { + version = "3.68.0"; + src = fetchFromGitHub { + owner = "SDL-Hercules-390"; + repo = "decNumber"; + rev = "3aa2f4531b5fcbd0478ecbaf72ccc47079c67280"; + hash = "sha256-PfPhnYUSIw1sYiGRM3iHRTbHHbQ+sK7oO12pH/yt+MQ="; + }; + }); + + softFloat = mkExtPkg "SoftFloat" (default: { + version = "3.5.0"; + src = fetchFromGitHub { + owner = "SDL-Hercules-390"; + repo = "SoftFloat"; + rev = "4b0c326008e174610969c92e69178939ed80653d"; + hash = "sha256-DEIT5Xk6IqUXCIGD2Wj0h9xPOR0Mid2Das7aKMQMDaM="; + }; + }); + + telnet = mkExtPkg "telnet" (default: { + version = "1.0.0"; + src = fetchFromGitHub { + owner = "SDL-Hercules-390"; + repo = "telnet"; + rev = "729f0b688c1426018112c1e509f207fb5f266efa"; + hash = "sha256-ED0Cl+VcK6yl59ShgJBZKy25oAFC8eji36pNLwMxTM0="; + }; + }); + + extpkgs = runCommand "hercules-extpkgs" {} '' + OUTINC="$out/include" + OUTLIB="$out/${herculesLibDir}" + mkdir -p "$OUTINC" "$OUTLIB" + for dep in "${crypto}" "${decNumber}" "${softFloat}" "${telnet}"; do + ln -s $dep/include/* "$OUTINC" + ln -s $dep/${herculesLibDir}/* "$OUTLIB" + done + ''; +in +stdenv.mkDerivation rec { + pname = "hercules"; + version = "4.6"; + + src = fetchFromGitHub { + owner = "SDL-Hercules-390"; + repo = "hyperion"; + rev = "Release_${version}"; + hash = "sha256-ZhMTun6tmTsmIiFPTRFudwRXzWydrih61RsLyv0p24U="; + }; + + postPatch = '' + patchShebangs _dynamic_version + ''; + + nativeBuildInputs = [ libtool ]; + buildInputs = [ + (lib.getOutput "lib" libtool) + zlib + bzip2 + extpkgs + ] ++ lib.optionals enableRexx [ + regina + ]; + + configureFlags = [ + "--enable-extpkgs=${extpkgs}" + "--without-included-ltdl" + "--enable-ipv6" + "--enable-cckd-bzip2" + "--enable-het-bzip2" + ] ++ lib.optionals enableRexx [ + "--enable-regina-rexx" + ]; + + meta = with lib; { + homepage = "https://sdl-hercules-390.github.io/html/"; + description = "IBM mainframe emulator"; + longDescription = '' + Hercules is an open source software implementation of the mainframe + System/370 and ESA/390 architectures, in addition to the latest 64-bit + z/Architecture. Hercules runs under Linux, Windows, Solaris, FreeBSD, and + Mac OS X. + ''; + license = licenses.qpl; + maintainers = with maintainers; [ anna328p vifino ]; + }; +} diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 54cdfbcf25f8b..ed14e56b1809c 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-3KRES/2mGO6b1ZZEGx29Yu5wgEG4NOJ7/J0xPvQiNWk="; + hash = "sha256-Z1N6iYXd3HswRJql3YZMot5fdkdFFbJuxyGDgLsbtQI="; }; - vendorHash = "sha256-5wByIkMs3321u4/2vPpsZ/L5zlcgrZo0b+NjeMR1RWE="; + vendorHash = "sha256-O0rlezMdhoRHdK37BGKW3CHLpYfkFC1d83o5u54LQ8k="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/mc/mcfly-fzf/package.nix b/pkgs/by-name/mc/mcfly-fzf/package.nix new file mode 100644 index 0000000000000..b7099c96e5277 --- /dev/null +++ b/pkgs/by-name/mc/mcfly-fzf/package.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "mcfly-fzf"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "bnprks"; + repo = "mcfly-fzf"; + rev = version; + hash = "sha256-3QxiG9MR0BCKRjA8ue/Yb/AZ5SwiSdjn6qaOxSAK0SI="; + }; + + postPatch = '' + substituteInPlace shell/mcfly-fzf.bash --replace '$(command -v mcfly-fzf)' '${placeholder "out"}/bin/mcfly-fzf' + substituteInPlace shell/mcfly-fzf.zsh --replace '$(command -v mcfly-fzf)' '${placeholder "out"}/bin/mcfly-fzf' + substituteInPlace shell/mcfly-fzf.fish --replace '(command -v mcfly-fzf)' '${placeholder "out"}/bin/mcfly-fzf' + ''; + + cargoHash = "sha256-pR5Fni/8iJuaDyWKrOnSanO50hvFXh73Qlgmd4a3Ucs="; + + meta = with lib; { + homepage = "https://github.com/bnprks/mcfly-fzf"; + description = "Integrate Mcfly with fzf to combine a solid command history database with a widely-loved fuzzy search UI"; + license = licenses.mit; + maintainers = [ maintainers.simonhammes ]; + mainProgram = "mcfly-fzf"; + }; +} diff --git a/pkgs/applications/audio/ocenaudio/default.nix b/pkgs/by-name/oc/ocenaudio/package.nix index daafc48deb7a1..155be35c92297 100644 --- a/pkgs/applications/audio/ocenaudio/default.nix +++ b/pkgs/by-name/oc/ocenaudio/package.nix @@ -7,25 +7,28 @@ , libjack2 , alsa-lib , bzip2 -, libpulseaudio }: +, libpulseaudio +, xz +}: stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.13.2"; + version = "3.13.3"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-ITlnOrreZHTH8NDjx/hQzEV3toAwaM2bWFLqMf3btNE="; + hash = "sha256-B0+NyFZ9c0ljzYMJm3741TpoxFS0Zo6hxzhadYFofSA="; }; nativeBuildInputs = [ + alsa-lib autoPatchelfHook - qt5.qtbase - qt5.wrapQtAppsHook + bzip2 libjack2 libpulseaudio - bzip2 - alsa-lib + qt5.qtbase + qt5.wrapQtAppsHook + xz ]; buildInputs = [ dpkg ]; diff --git a/pkgs/by-name/qs/qspeakers/package.nix b/pkgs/by-name/qs/qspeakers/package.nix new file mode 100644 index 0000000000000..ffee7775154fd --- /dev/null +++ b/pkgs/by-name/qs/qspeakers/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, libsForQt5 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qspeakers"; + version = "1.6.9"; + + src = fetchFromGitHub { + owner = "be1"; + repo = "qspeakers"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-V4rcDUJU27ijzsc6zhsEiQ/7SdvHmGR2402iIazrMfE="; + }; + + nativeBuildInputs = [ + libsForQt5.qmake + libsForQt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsForQt5.qtcharts + libsForQt5.qttools + ]; + + meta = { + description = "A loudspeaker enclosure designer"; + homepage = "https://github.com/be1/qspeakers"; + license = lib.licenses.gpl3Plus; + mainProgram = "qspeakers"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +}) diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix new file mode 100644 index 0000000000000..b94692a119acf --- /dev/null +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -0,0 +1,16 @@ +{ renode +, fetchurl +, buildUnstable ? true +}: + +(renode.override { + inherit buildUnstable; +}).overrideAttrs (finalAttrs: _: { + pname = "renode-unstable"; + version = "1.14.0+20231229gita76dac0ae"; + + src = fetchurl { + url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; + hash = "sha256-fvwNN3sT8VZ7XJPrfpAbjSiuAB274QhuPeekwz0AU3c="; + }; +}) diff --git a/pkgs/by-name/re/renode/package.nix b/pkgs/by-name/re/renode/package.nix new file mode 100644 index 0000000000000..33646daac8c5b --- /dev/null +++ b/pkgs/by-name/re/renode/package.nix @@ -0,0 +1,103 @@ +{ stdenv +, lib +, fetchurl +, autoPatchelfHook +, makeWrapper +, writeScript +, glibcLocales +, python3Packages +, gtk-sharp-2_0 +, gtk2-x11 +, screen +, buildUnstable ? false +}: + +let + pythonLibs = with python3Packages; makePythonPath [ + construct + psutil + pyyaml + requests + robotframework + ]; +in +stdenv.mkDerivation (finalAttrs: { + pname = "renode"; + version = "1.14.0"; + + src = fetchurl { + url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; + hash = "sha256-1wfVHtCYc99ACz8m2XEg1R0nIDh9xP4ffV/vxeeEHxE="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + propagatedBuildInputs = [ + gtk2-x11 + gtk-sharp-2_0 + screen + ]; + + strictDeps = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,libexec/renode} + + mv * $out/libexec/renode + mv .renode-root $out/libexec/renode + chmod +x $out/libexec/renode/*.so + + makeWrapper "$out/libexec/renode/renode" "$out/bin/renode" \ + --prefix PATH : "$out/libexec/renode" \ + --suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" + + makeWrapper "$out/libexec/renode/renode-test" "$out/bin/renode-test" \ + --prefix PATH : "$out/libexec/renode" \ + --prefix PYTHONPATH : "${pythonLibs}" \ + --suffix LD_LIBRARY_PATH : "${gtk2-x11}/lib" \ + --set LOCALE_ARCHIVE "${glibcLocales}/lib/locale/locale-archive" + + substituteInPlace "$out/libexec/renode/renode-test" \ + --replace '$PYTHON_RUNNER' '${python3Packages.python}/bin/python3' + + runHook postInstall + ''; + + passthru.updateScript = + let + versionRegex = + if buildUnstable + then "[0-9\.\+]+[^\+]*." + else "[0-9\.]+[^\+]*."; + in + writeScript "${finalAttrs.pname}-updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl gnugrep gnused pup + + latestVersion=$( + curl -sS https://builds.renode.io \ + | pup 'a text{}' \ + | egrep 'renode-${versionRegex}\.linux-portable\.tar\.gz' \ + | head -n1 \ + | sed -e 's,renode-\(.*\)\.linux-portable\.tar\.gz,\1,g' + ) + + update-source-version ${finalAttrs.pname} "$latestVersion" \ + --file=pkgs/by-name/re/${finalAttrs.pname}/package.nix \ + --system=x86_64-linux + ''; + + meta = { + description = "Virtual development framework for complex embedded systems"; + homepage = "https://renode.org"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ otavio ]; + platforms = [ "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index bee2a13d50272..fb34f2e79d569 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -1,19 +1,21 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - makeBinaryWrapper, - pkg-config, - libGL, - libxkbcommon, - xorg, - wineWowPackages, - fetchpatch, -}: let +{ lib +, buildGoModule +, fetchFromGitHub +, makeBinaryWrapper +, pkg-config +, libGL +, libxkbcommon +, xorg +, wayland +, vulkan-headers +, wineWowPackages +, fetchpatch +}: +let # wine-staging doesn't support overrideAttrs for now wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: { patches = - (oldAttrs.patches or []) + (oldAttrs.patches or [ ]) ++ [ # upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 # Here are the currently applied patches for Roblox to run under WINE: @@ -25,46 +27,46 @@ ]; }); in - buildGoModule rec { - pname = "vinegar"; - version = "1.5.9"; +buildGoModule rec { + pname = "vinegar"; + version = "1.6.0"; - src = fetchFromGitHub { - owner = "vinegarhq"; - repo = "vinegar"; - rev = "v${version}"; - hash = "sha256-cLzQnNmQYyAIdTGygk/CNU/mxGgcgoFTg5G/0DNwpz4="; - }; + src = fetchFromGitHub { + owner = "vinegarhq"; + repo = "vinegar"; + rev = "v${version}"; + hash = "sha256-TebRAqMPrXSSKg05iX3Y/S0uACePOR/QNnNcOOMw+Xk="; + }; - vendorHash = "sha256-DZI4APnrldnwOmLZ9ucFBGQDxzPXTIi44eLu74WrSBI="; + vendorHash = "sha256-Ex6PRd3rD2jbLXlY36koNvZF3P+gAZTE9hExIfOw9CE="; - nativeBuildInputs = [pkg-config makeBinaryWrapper]; - buildInputs = [libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wine]; + nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; + buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; - buildPhase = '' - runHook preBuild - make PREFIX=$out - runHook postBuild - ''; + buildPhase = '' + runHook preBuild + make PREFIX=$out + runHook postBuild + ''; - installPhase = '' - runHook preInstall - make PREFIX=$out install - runHook postInstall - ''; + installPhase = '' + runHook preInstall + make PREFIX=$out install + runHook postInstall + ''; - postInstall = '' - wrapProgram $out/bin/vinegar \ - --prefix PATH : ${lib.makeBinPath [wine]} - ''; + postInstall = '' + wrapProgram $out/bin/vinegar \ + --prefix PATH : ${lib.makeBinPath [wine]} + ''; - meta = with lib; { - description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; - homepage = "https://github.com/vinegarhq/vinegar"; - changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; - mainProgram = "vinegar"; - license = licenses.gpl3Only; - platforms = ["x86_64-linux" "i686-linux"]; - maintainers = with maintainers; [nyanbinary]; - }; - } + meta = with lib; { + description = "An open-source, minimal, configurable, fast bootstrapper for running Roblox on Linux"; + homepage = "https://github.com/vinegarhq/vinegar"; + changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; + mainProgram = "vinegar"; + license = licenses.gpl3Only; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ nyanbinary ]; + }; +} diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix index 24cde3f38989d..5393c54f7c335 100644 --- a/pkgs/data/themes/colloid-kde/default.nix +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -18,13 +18,7 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-AYH9fW20/p+mq6lxR1lcCV1BQ/kgcsjHncpMvYWXnWA="; }; - # Propagate sddm theme dependencies to user env otherwise sddm does - # not find them. Putting them in buildInputs is not enough. - propagatedUserEnvPkgs = [ - kdeclarative.bin - plasma-framework - plasma-workspace - ]; + outputs = [ "out" "sddm" ]; postPatch = '' patchShebangs install.sh @@ -34,12 +28,12 @@ stdenvNoCC.mkDerivation rec { --replace '$HOME/.config' $out/share substituteInPlace sddm/install.sh \ - --replace /usr $out \ + --replace /usr $sddm \ --replace '$(cd $(dirname $0) && pwd)' . \ --replace '"$UID" -eq "$ROOT_UID"' true substituteInPlace sddm/Colloid/Main.qml \ - --replace /usr $out + --replace /usr $sddm ''; installPhase = '' @@ -50,13 +44,23 @@ stdenvNoCC.mkDerivation rec { name= HOME="$TMPDIR" \ ./install.sh --dest $out/share/themes - mkdir -p $out/share/sddm/themes + mkdir -p $sddm/share/sddm/themes cd sddm source install.sh runHook postInstall ''; + postFixup = '' + # Propagate sddm theme dependencies to user env otherwise sddm + # does not find them. Putting them in buildInputs is not enough. + + mkdir -p $sddm/nix-support + + printWords ${kdeclarative.bin} ${plasma-framework} ${plasma-workspace} \ + >> $sddm/nix-support/propagated-user-env-packages + ''; + passthru.updateScript = gitUpdater { }; meta = with lib; { diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index a15975872df42..34485cf87363d 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.26.3"; + version = "1.27.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2fg6oP2TNPRN7rTklS3A5RRGg6+seG/uvOYDCVFhfRU="; + sha256 = "sha256-PfuZ+8wmjAvHl+L4PoxQPvneZihPQLOBu1l6CBhcAPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 7818df245f693..9b5abbd8a564c 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.25.4"; + version = "0.26.0"; src = fetchurl { url = "https://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-VttdIGuCG5qIMdJucT5BCscLIlWm9D/N98Ae794jt6I="; + sha256 = "sha256-EbbvBnG+X+rWiL9VTDCiocaDSTrRDF/jEV/7RlVCToQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lomiri/services/hfd-service/default.nix b/pkgs/desktops/lomiri/services/hfd-service/default.nix index cffedb0af6235..e9ae4a0fe2dba 100644 --- a/pkgs/desktops/lomiri/services/hfd-service/default.nix +++ b/pkgs/desktops/lomiri/services/hfd-service/default.nix @@ -31,10 +31,11 @@ stdenv.mkDerivation (finalAttrs: { # Queries pkg-config via pkg_get_variable, can't override prefix substituteInPlace init/CMakeLists.txt \ - --replace "\''${SYSTEMD_SYSTEM_DIR}" "$out/lib/systemd/system" + --replace 'pkg_get_variable(SYSTEMD_SYSTEM_DIR systemd systemdsystemunitdir)' 'set(SYSTEMD_SYSTEM_DIR ''${CMAKE_INSTALL_PREFIX}/lib/systemd/system)' substituteInPlace CMakeLists.txt \ - --replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_DATADIR}/accountsservice/interfaces")' \ - --replace 'DESTINATION ''${DBUS_INTERFACES_DIR}' 'DESTINATION ${placeholder "out"}/''${DBUS_INTERFACES_DIR}' + --replace 'pkg_get_variable(AS_INTERFACES_DIR accountsservice interfacesdir)' 'set(AS_INTERFACES_DIR "''${CMAKE_INSTALL_FULL_DATADIR}/accountsservice/interfaces")' \ + --replace '../../dbus-1/interfaces' "\''${CMAKE_INSTALL_PREFIX}/\''${DBUS_INTERFACES_DIR}" \ + --replace 'DESTINATION ''${DBUS_INTERFACES_DIR}' 'DESTINATION ''${CMAKE_INSTALL_PREFIX}/''${DBUS_INTERFACES_DIR}' substituteInPlace src/CMakeLists.txt \ --replace "\''${DBUS_INTERFACES_DIR}/org.freedesktop.Accounts.xml" '${accountsservice}/share/dbus-1/interfaces/org.freedesktop.Accounts.xml' ''; diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 7e7f19c566671..fe3b23323c633 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.9"; + version = "4.18.10"; - sha256 = "sha256-FiJAxELdt/1g5ThTBshTSFK54f9Ncqhn/C+rWQ+zrig="; + sha256 = "sha256-jne+jETPmM6VksdwJAxruji/GKH42iftWm74Ok9qX44="; nativeBuildInputs = [ docbook_xsl diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 630b5f5193fb6..c80af02c32a7c 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.11.1.1429"; + version = "1.11.1.1435"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-ov3s1qPGHfPGAPtgwAqPG+hU6R5nGMA7ucg8QVpquC4="; + hash = "sha256-RS/FebIED8RYYXRXBKXZPRROO0HqyDo0zhb+p4Q5m8A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix index 56a8e59433cd7..d3279bbe991a0 100644 --- a/pkgs/development/libraries/libks/default.nix +++ b/pkgs/development/libraries/libks/default.nix @@ -7,17 +7,19 @@ , libuuid , openssl , libossp_uuid +, freeswitch +, nix-update-script }: stdenv.mkDerivation rec { pname = "libks"; - version = "1.8.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TJ3q97K3m3zYGB1D5lLVyrh61L3vtnP5I64lP/DYzW4="; + sha256 = "sha256-iAgiGo/PMG0L4S/ZqSPL7Hl8akCNyva4JhaOkcHit8w="; }; patches = [ @@ -38,7 +40,13 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isLinux libuuid ++ lib.optional stdenv.isDarwin libossp_uuid; + passthru = { + tests.freeswitch = freeswitch; + updateScript = nix-update-script { }; + }; + meta = with lib; { + broken = stdenv.isDarwin; description = "Foundational support for signalwire C products"; homepage = "https://github.com/signalwire/libks"; maintainers = with lib.maintainers; [ misuzu ]; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index f45404e2c1f38..8e3b37c7635a7 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.7.0"; + version = "3.8.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-7wNzYp6o3+71Jz/VuDWyVOj+OrAkDyDG0NWryYwuIT4="; + sha256 = "sha256-zKoK5GsgNnmQrEZ5HAse2e1Gy7fPO42DEvVAL5ZTNhc="; }; buildInputs = [ diff --git a/pkgs/development/php-packages/grpc/default.nix b/pkgs/development/php-packages/grpc/default.nix index d3bae3ea9c766..e70432f37ee83 100644 --- a/pkgs/development/php-packages/grpc/default.nix +++ b/pkgs/development/php-packages/grpc/default.nix @@ -1,18 +1,24 @@ { buildPecl -, zlib +, pkg-config , lib +, grpc }: buildPecl { pname = "grpc"; - version = "1.56.0"; + inherit (grpc) version src; - sha256 = "sha256-uzxYMUzExMBDtwv3FipOuuUHg0v1wqAUtn69jXAQnf4="; + sourceRoot = "${grpc.src.name}/src/php/ext/grpc"; - doCheck = true; - checkTarget = "test"; + patches = [ + ./use-pkgconfig.patch # https://github.com/grpc/grpc/pull/35404 + ./skip-darwin-test.patch # https://github.com/grpc/grpc/pull/35403 + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ grpc ]; - nativeBuildInputs = [ zlib ]; + doCheck = true; meta = { description = "A high performance, open source, general RPC framework that puts mobile and HTTP/2 first."; diff --git a/pkgs/development/php-packages/grpc/skip-darwin-test.patch b/pkgs/development/php-packages/grpc/skip-darwin-test.patch new file mode 100644 index 0000000000000..e6c5fb34a6692 --- /dev/null +++ b/pkgs/development/php-packages/grpc/skip-darwin-test.patch @@ -0,0 +1,22 @@ +From b1fa212d0bc29dcc72107ad67fb99d4ef573942a Mon Sep 17 00:00:00 2001 +From: Shyim <github@shyim.de> +Date: Thu, 28 Dec 2023 10:28:21 +0100 +Subject: [PATCH] php: skip epoll1 test on darwin + +--- + tests/grpc-set-ini.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/grpc-set-ini.phpt b/tests/grpc-set-ini.phpt +index 55c18ee526e24..b39348ea2e685 100644 +--- a/tests/grpc-set-ini.phpt ++++ b/tests/grpc-set-ini.phpt +@@ -1,7 +1,7 @@ + --TEST-- + Ensure ini settings are handled + --SKIPIF-- +-<?php if (!extension_loaded("grpc")) print "skip"; ?> ++<?php if (!extension_loaded("grpc") || PHP_OS === "Darwin") print "skip"; ?> + --INI-- + grpc.enable_fork_support = 1 + grpc.poll_strategy = epoll1 \ No newline at end of file diff --git a/pkgs/development/php-packages/grpc/use-pkgconfig.patch b/pkgs/development/php-packages/grpc/use-pkgconfig.patch new file mode 100644 index 0000000000000..628f54abb305f --- /dev/null +++ b/pkgs/development/php-packages/grpc/use-pkgconfig.patch @@ -0,0 +1,82 @@ +From 24b4e273bd503760a485e92ca418e4699767ec51 Mon Sep 17 00:00:00 2001 +From: Shyim <github@shyim.de> +Date: Thu, 28 Dec 2023 10:38:42 +0100 +Subject: [PATCH] [php]: add with-grpc-dir to configure and add pkg-config + support + +--- + config.m4 | 48 +++++++++++++++++++++++++------------- + 1 file changed, 32 insertions(+), 16 deletions(-) + +diff --git a/config.m4 b/config.m4 +index 5600df34ccfa3..c2186a41d21f5 100755 +--- a/config.m4 ++++ b/config.m4 +@@ -7,35 +7,51 @@ PHP_ARG_ENABLE(coverage, whether to include code coverage symbols, + PHP_ARG_ENABLE(tests, whether to compile helper methods for tests, + [ --enable-tests Enable tests methods], no, no) + ++PHP_ARG_WITH(grpc-dir, for grpc, ++[ --with-grpc-dir[=DIR] Set the path to grpc install prefix.], yes) ++ + dnl Check whether to enable tests + if test "$PHP_TESTS" != "no"; then + CPPFLAGS="$CPPFLAGS -DGRPC_PHP_DEBUG" + fi + + if test "$PHP_GRPC" != "no"; then +- dnl Write more examples of tests here... +- +- dnl # --with-grpc -> check with-path +- SEARCH_PATH="/usr/local /usr" # you might want to change this +- SEARCH_FOR="include/grpc/grpc.h" # you most likely want to change this +- if test -r $PHP_GRPC/$SEARCH_FOR; then # path given as parameter +- GRPC_DIR=$PHP_GRPC +- else # search default path list ++ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) ++ ++ if test "$PHP_GRPC_DIR" = "yes" -a -x $PKG_CONFIG; then ++ AC_MSG_CHECKING([for grpc using pkg-config]) ++ ++ if ! $PKG_CONFIG --exists grpc ; then ++ AC_MSG_ERROR([grpc not found]) ++ fi ++ ++ GRPC_VERSION=`$PKG_CONFIG grpc --modversion` ++ AC_MSG_RESULT([found version $GRPC_VERSION]) ++ ++ PHP_GRPC_LIBS=`$PKG_CONFIG grpc --libs` ++ PHP_GRPC_INCS=`$PKG_CONFIG grpc --cflags` ++ ++ PHP_EVAL_LIBLINE($PHP_GRPC_LIBS, AMQP_SHARED_LIBADD) ++ PHP_EVAL_INCLINE($PHP_GRPC_INCS) ++ else + AC_MSG_CHECKING([for grpc files in default path]) ++ ++ SEARCH_PATH="$PHP_GRPC_DIR /usr/local /usr" ++ + for i in $SEARCH_PATH ; do +- if test -r $i/$SEARCH_FOR; then ++ if test -r $i/include/grpc/grpc.h; then + GRPC_DIR=$i + AC_MSG_RESULT(found in $i) + fi + done +- fi +- if test -z "$GRPC_DIR"; then +- AC_MSG_RESULT([not found]) +- AC_MSG_ERROR([Please reinstall the grpc distribution]) +- fi + +- dnl # --with-grpc -> add include path +- PHP_ADD_INCLUDE($GRPC_DIR/include) ++ if test -z "$GRPC_DIR"; then ++ AC_MSG_RESULT([not found]) ++ AC_MSG_ERROR([Please reinstall the grpc distribution]) ++ fi ++ ++ PHP_ADD_INCLUDE($GRPC_DIR/include) ++ fi + + LIBS="-lpthread $LIBS" + diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix new file mode 100644 index 0000000000000..6daf9868a4a4a --- /dev/null +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "apkinspector"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-bB/WeCRnYOdfg4bm9Nloa2QMxr2IJW8IZd+svUno4N0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # Tests are not available + # https://github.com/erev0s/apkInspector/issues/21 + doCheck = false; + + pythonImportsCheck = [ + "apkInspector" + ]; + + meta = with lib; { + description = "Module designed to provide detailed insights into the zip structure of APK files"; + homepage = "https://github.com/erev0s/apkInspector"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 0acc3cb4589ff..c6eaaab35a785 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.83"; + version = "0.2.84"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - hash = "sha256-tpncBgKUf2jRmvcHgi2fudTGdCEv0AhHUWD1sPO98/I="; + hash = "sha256-aSFnDLzJCZjHX6m/iZKC5F5kY7JXRZp0//jY8kkjC3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datetime/default.nix b/pkgs/development/python-modules/datetime/default.nix index 173431c924da7..98b33ecf7fd38 100644 --- a/pkgs/development/python-modules/datetime/default.nix +++ b/pkgs/development/python-modules/datetime/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "datetime"; - version = "5.2"; + version = "5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zopefoundation"; repo = "datetime"; rev = "refs/tags/${version}"; - hash = "sha256-J96IjyPyJaUC5mECK3g/cgxBh1OoVfj62XocBatYgOw="; + hash = "sha256-k4q9n3uikz+B9CUyqQTgl61OTKDWMsyhAt2gB1HWGRw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-reversion/default.nix b/pkgs/development/python-modules/django-reversion/default.nix index cb0119bb7d504..7eaa9c3a71892 100644 --- a/pkgs/development/python-modules/django-reversion/default.nix +++ b/pkgs/development/python-modules/django-reversion/default.nix @@ -3,20 +3,25 @@ , fetchPypi , django , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.8"; - format = "setuptools"; + version = "5.0.10"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RdN4vG5gbfayrQB3rsiwoA418Yx0yioa6cwmLOsy+5o="; + hash = "sha256-wYdJpnwdtBZ8yszDY5XF/mB48xKGloPC89IUBR5aayk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/eiswarnung/default.nix b/pkgs/development/python-modules/eiswarnung/default.nix index ccd2b849570ca..c4a3cf9339cb7 100644 --- a/pkgs/development/python-modules/eiswarnung/default.nix +++ b/pkgs/development/python-modules/eiswarnung/default.nix @@ -13,23 +13,25 @@ buildPythonPackage rec { pname = "eiswarnung"; - version = "1.2.0"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-eiswarnung"; rev = "refs/tags/v${version}"; - hash = "sha256-PVFAy34+UfNQNdzVdfvNiySrCTaKGuepnTINZYkOsuo="; + hash = "sha256-/61qrRfD7/gaEcvFot34HYXOVLWwTDi/fvcgHDTv9u0="; }; + __darwinAllowLocalNetworking = true; + postPatch = '' substituteInPlace pyproject.toml \ --replace '"0.0.0"' '"${version}"' \ --replace 'addopts = "--cov"' "" \ - --replace 'pytz = "^2022.7.1"' 'pytz = "*"' + --replace 'pytz = ">=2022.7.1,<2024.0.0"' 'pytz = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index 1765fd4ff60b7..ffae39669ad40 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "empy"; - version = "4.0"; + version = "4.0.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JNmmKyN+G1+c7Lqw6Ta/9zVAJS0R6sb95/62OxSHuOM="; + sha256 = "sha256-YjI3uYzWQ75eILrWJ1zJM//nz3ZFI5Lx0ybXZywqvWQ="; }; pythonImportsCheck = [ "em" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 1a71c5d179391..9093afc2353aa 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "heatzypy"; - version = "2.1.9"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-O2HtCaNtBvjhjlSXLRhEuilI8z7nGgzFa8USYiHfZ+E="; + hash = "sha256-Q6v1Ob1PY8tpMnd8hchepq983dsZ6lJPCKz83RRwL3w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/langchainplus-sdk/default.nix b/pkgs/development/python-modules/langchainplus-sdk/default.nix deleted file mode 100644 index 8747c0a8d9e8e..0000000000000 --- a/pkgs/development/python-modules/langchainplus-sdk/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, poetry-core -, pydantic -, pythonOlder -, requests -, tenacity -}: - -buildPythonPackage rec { - pname = "langchainplus-sdk"; - version = "0.0.21"; - format = "pyproject"; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit version; - pname = "langchainplus_sdk"; - hash = "sha256-frjZnQnOe6IHKrQk+Q/xMc5Akb+eBQ/eBzP545Fq6Xk="; - }; - - nativeBuildInputs = [ - poetry-core - ]; - - propagatedBuildInputs = [ - pydantic - requests - tenacity - ]; - - # upstrem has no tests - doCheck = false; - - pythonImportsCheck = [ - "langchainplus_sdk" - ]; - - meta = { - description = "Client library to connect to the LangChainPlus LLM Tracing and Evaluation Platform"; - homepage = "https://pypi.org/project/langchainplus-sdk/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; - }; -} diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index ccc0e99b51116..8ecdedfa2b500 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "mandown"; - version = "1.6.0"; + version = "1.6.1"; format = "pyproject"; src = fetchFromGitHub { owner = "potatoeggy"; repo = "mandown"; rev = "refs/tags/v${version}"; - hash = "sha256-2kFzB1xLVEvO7Vo39lwQsVirRY6Z8GMczWK2b1oVYTg="; + hash = "sha256-vf7BCreRb77QkurZJ5cKCVxZe+fErd7/6NQTupa4Xao="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylatex/default.nix b/pkgs/development/python-modules/pylatex/default.nix new file mode 100644 index 0000000000000..44926587aa33c --- /dev/null +++ b/pkgs/development/python-modules/pylatex/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, ordered-set +, pytestCheckHook +, matplotlib +, quantities +, texlive +}: + +buildPythonPackage rec { + pname = "pylatex"; + version = "1.4.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "JelteF"; + repo = "PyLaTeX"; + rev = "v${version}"; + hash = "sha256-gZKMYGMp7bzDY5+Xx9h1AFP4l0Zd936fDfSXyW5lY1k="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ ordered-set ]; + + pythonImportsCheck = [ + "pylatex" + "pylatex.base_classes" + ]; + + nativeCheckInputs = [ + pytestCheckHook + matplotlib + quantities + (texlive.combine { inherit (texlive) + scheme-small + lastpage + collection-fontsrecommended + ;}) + ]; + + meta = with lib; { + description = "A Python library for creating LaTeX files and snippets"; + homepage = "https://jeltef.github.io/PyLaTeX/current/"; + downloadPage = "https://github.com/JelteF/PyLaTeX/releases"; + changelog = "https://jeltef.github.io/PyLaTeX/current/changelog.html"; + license = licenses.mit; + maintainers = with maintainers; [ MayNiklas ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index bea510faa93af..fb218491c7707 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -16,24 +16,24 @@ , pytestCheckHook , setuptools , tomli +, virtualenv , wheel }: buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.5.1"; - format = "pyproject"; + version = "0.7.0"; + pyproject = true; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-xtrVpRJ7Kr+qI8uR0jrCEFn9d83fcSKzP9B3kQJNz78="; + hash = "sha256-hffyRpxWjGzjWrL6Uv4tJqBODeUH06JMGrtyg3Vlf9M="; }; - postPatch = '' + postPatch = lib.optionalString (pythonOlder "3.11") '' substituteInPlace pyproject.toml \ - --replace 'minversion = "7.2"' "" \ - --replace '"error",' '"error", "ignore::DeprecationWarning", "ignore::UserWarning",' + --replace '"error",' '"error", "ignore::UserWarning",' ''; nativeBuildInputs = [ @@ -65,6 +65,7 @@ buildPythonPackage rec { pytest-subprocess pytestCheckHook setuptools + virtualenv wheel ] ++ passthru.optional-dependencies.pyproject; @@ -76,6 +77,8 @@ buildPythonPackage rec { "tests/test_pyproject_pep660.py" "tests/test_setuptools_pep517.py" "tests/test_setuptools_pep518.py" + # store permissions issue in Nix: + "tests/test_editable.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index 16b77ffabc472..ad1e3f0279b37 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -15,17 +15,16 @@ buildPythonPackage rec { pname = "textual-dev"; - version = "1.2.1"; + version = "1.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "Textualize"; repo = "textual-dev"; - # we use rev instead of tag since upstream doesn't use tags - rev = "6afa9013a42cb18e9105e49d6a56874097f7c812"; - hash = "sha256-ef35389ZMU/zih7Se3KkMGECf5o2i5y6up64/1AECas="; + rev = "refs/tags/v${version}"; + hash = "sha256-66LcU9xXNWzoYV7ykbbKGO3/0URDu/GN2dmtxu1joqw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index aeaca734587d2..77dbc45a16125 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "virt-firmware"; - version = "23.10"; + version = "23.11"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-orTIduS4KVH4nTSRcOnn2+Tqeyd4OMnnN2+AK5p1xtM="; + hash = "sha256-9HA87J01M9VGCHdcmdlA50AikXG8vYHDw/5ig8h9YXc="; }; pythonImportsCheck = [ "virt.firmware.efi" ]; diff --git a/pkgs/development/python-modules/zope-exceptions/default.nix b/pkgs/development/python-modules/zope-exceptions/default.nix new file mode 100644 index 0000000000000..8146b2b2704ba --- /dev/null +++ b/pkgs/development/python-modules/zope-exceptions/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools +, zope_interface +}: + +buildPythonPackage rec { + pname = "zope-exceptions"; + version = "5.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "zope.exceptions"; + inherit version; + hash = "sha256-MPxT5TOfX72dEzXg97afd/FePwbisXt/t++SXMJP3ZY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ zope_interface ]; + + # circular deps + doCheck = false; + + pythonImportsCheck = [ + "zope.exceptions" + ]; + + meta = with lib; { + description = "Exception interfaces and implementations"; + homepage = "https://pypi.python.org/pypi/zope.exceptions"; + changelog = "https://github.com/zopefoundation/zope.exceptions/blob/${version}/CHANGES.rst"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; + +} diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix deleted file mode 100644 index 14c81f7924fa7..0000000000000 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, zope_interface -}: - -buildPythonPackage rec { - pname = "zope.exceptions"; - version = "4.6"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-YZ0kpMZb7Zez3QUV5zLoK2nxVdQsyUlV0b6MKCiGg80="; - }; - - propagatedBuildInputs = [ zope_interface ]; - - # circular deps - doCheck = false; - - meta = with lib; { - description = "Exception interfaces and implementations"; - homepage = "https://pypi.python.org/pypi/zope.exceptions"; - license = licenses.zpl20; - maintainers = with maintainers; [ goibhniu ]; - }; - -} diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 2307494fcbde6..f3a762e3a2c51 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , zope_interface -, zope_exceptions +, zope-exceptions , zope-testing , six }: @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-1r1y9E6jLKpBW5bP4UFSsnhjF67xzW9IqCe2Le8Fj9Q="; }; - propagatedBuildInputs = [ zope_interface zope_exceptions zope-testing six ]; + propagatedBuildInputs = [ zope_interface zope-exceptions zope-testing six ]; doCheck = false; # custom test modifies sys.path diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index ff02a02fa7025..095727e5713e1 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.23.0"; + version = "2.24.2"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "g92AUmrfu+naLUo11u0fqJKPRiY2nSIUAqZY4D6ti0I="; + sha256 = "8dcsXdisPlPx6glIw+cSTQ2UJ6hh9CfqmFj2kqZWkR8="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "l8KwAvD8tWiVNYCp9HikBDPSr+8iYhp5svdTkhitxy0="; + sha256 = "Kf4Cm9Zp9F4vKkOSqTf+zfTo9OlMd94HYbAy0cTjZ74="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "Ffg2kwg/jOMwEHujfb0x4tjc6PLPswVi3EWm+u/o5wc="; + sha256 = "8ZKmONiFl5dKN4NsvY5bEmyHcn28KQCXl2lnv3giAU4="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "yywxgvzK7BKzYsiElYLy8M80RKIp6ksNv0wq4QzRyfY="; + sha256 = "zmbLDnQL2oJMEAclms1gNLOOAD68EsveEA0yzbDcFvM="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "4o34UR411nokdvpSMhbdrL9D4r4ZqoS7pwDEj153GZg="; + sha256 = "1PejmLFwYXRetJ4WukQZ+m9HZuoxvUxU9h0EXlLHGOQ="; }; }; diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index faa833e17c2c1..580e52f300949 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.23"; + version = "0.2.24"; src = fetchCrate { inherit pname version; - hash = "sha256-/vtLRigu/DjvzB3k5UENrUm5JWMhFUV/kkE+2pzgTKo="; + hash = "sha256-VRRuC/y1+oZoM0SKCaVTa1sK80dbrtyAxc2OFSxhI/Q="; }; - cargoHash = "sha256-X9nFwsh6Q82EG/0iYlTUDkkm2okYfTLbOihslNREQTY="; + cargoHash = "sha256-rytxXaJk7r+ktgxsUY+NxMOJdqnsvcyXRSswEriYH+c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/swiftpm2nix/support.nix b/pkgs/development/tools/swiftpm2nix/support.nix index 9b944a133daa7..dfc2d01a45017 100644 --- a/pkgs/development/tools/swiftpm2nix/support.nix +++ b/pkgs/development/tools/swiftpm2nix/support.nix @@ -29,6 +29,7 @@ in rec { url = dep.packageRef.location; rev = dep.state.checkoutState.revision; sha256 = hashes.${dep.subpath}; + fetchSubmodules = true; })) workspaceState.object.dependencies ); diff --git a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh index db00b1ad2b527..eda7f475064a9 100755 --- a/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh +++ b/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh @@ -23,7 +23,7 @@ hashes="" jq -r '.object.dependencies[] | "\(.subpath) \(.packageRef.location) \(.state.checkoutState.revision)"' $stateFile \ | while read -r name url rev; do echo >&2 "-- Fetching $name" - sha256="$(nix-prefetch-git $url $rev | jq -r .sha256)" + sha256="$(nix-prefetch-git --fetch-submodules $url $rev | jq -r .sha256)" hashes+=" \"$name\" = \"$sha256\";" echo >&2 diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index 44328eb46474d..0ef0329d306fc 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-ROZVmhdy3vltNeSgV65aAwythgydusYYVB7XQOJ/spw="; - aarch64-linux = "sha256-aX6CTnsWCwf0wDc7wl3skHwC5aJgoBz/2JtgS34eX4s="; - armv7l-linux = "sha256-q1449OZ5wvgdJjxhg1+noQVFcFfHKokHtV6CbR8evgs="; - x86_64-darwin = "sha256-2eVT5TbektDvXYQzaBc0A9bxv8bKY70cmdIA3WN0u68="; - x86_64-linux = "sha256-i0fjaFQbzXL2DIN5Q/+1GRhWTRoaa4tGnDCv6Cl4BhI="; + aarch64-darwin = "sha256-m35adxhRSEFV6BIpn89VKVQRklI+xWK4sNO4u2corCg="; + aarch64-linux = "sha256-oKSrc579aO7DxOsP9UTE0LZsKfNoIdZ97Uy1nTMjGqk="; + armv7l-linux = "sha256-YJ0UGQuBl0Etsw1cra2i741RQ7NOOyoYPmvNWCOeOIU="; + x86_64-darwin = "sha256-5R5iGn2uJuTMQwnsXQmfDkyGAPLbP+j9OHzt5OMIW8E="; + x86_64-linux = "sha256-S4/rjrBjK7sh5D+V6On/r5NXLII0fClnS+7lKmDEML4="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.3.6"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/tools/xcodes/default.nix b/pkgs/development/tools/xcodes/default.nix index f10fd76aa0202..a7449aa08651c 100644 --- a/pkgs/development/tools/xcodes/default.nix +++ b/pkgs/development/tools/xcodes/default.nix @@ -1,41 +1,60 @@ -{ lib, stdenv, fetchurl, unzip }: - +{ lib +, stdenv +, fetchFromGitHub +, swift +, swiftpm +, swiftpm2nix +, makeWrapper +, CryptoKit +, LocalAuthentication +, libcompression +, aria2 +}: +let + generated = swiftpm2nix.helpers ./generated; +in stdenv.mkDerivation (finalAttrs: { pname = "xcodes"; version = "1.4.1"; - src = fetchurl { - url = "https://github.com/XcodesOrg/xcodes/releases/download/${finalAttrs.version}/xcodes.zip"; - hash = "sha256-PtXF2eqNfEX29EtXlcjdxrUs7BPn/YurUuFFeLpXwrk="; + src = fetchFromGitHub { + owner = "XcodesOrg"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-ARrSQ9ozM90Yg7y4WdU7jjNQ64sXHuhxZh/iNJcFfY0="; }; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ swift swiftpm makeWrapper ]; - unpackPhase = '' - runHook preUnpack - unzip -q $src - runHook postUnpack - ''; + buildInputs = [ + CryptoKit + LocalAuthentication + libcompression + ]; - dontPatch = true; - dontConfigure = true; - dontBuild = true; + configurePhase = generated.configure; installPhase = '' runHook preInstall - mkdir -p $out/bin - install -m755 xcodes $out/bin/xcodes + + binPath="$(swiftpmBinPath)" + install -D $binPath/xcodes $out/bin/xcodes + wrapProgram $out/bin/xcodes \ + --prefix PATH : ${lib.makeBinPath [ aria2 ]} + runHook postInstall ''; - dontFixup = true; - meta = with lib; { changelog = "https://github.com/XcodesOrg/xcodes/releases/tag/${finalAttrs.version}"; description = "Command-line tool to install and switch between multiple versions of Xcode"; homepage = "https://github.com/XcodesOrg/xcodes"; - license = licenses.mit; - maintainers = with maintainers; [ _0x120581f ]; + license = with licenses; [ + mit + # unxip + lgpl3Only + ]; + maintainers = with maintainers; [ _0x120581f emilytrau ]; platforms = platforms.darwin; }; }) diff --git a/pkgs/development/tools/xcodes/generated/default.nix b/pkgs/development/tools/xcodes/generated/default.nix new file mode 100644 index 0000000000000..32ec081a93801 --- /dev/null +++ b/pkgs/development/tools/xcodes/generated/default.nix @@ -0,0 +1,17 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg"; + "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7"; + "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l"; + "LegibleError" = "08x5agha74chq1z5c7c5r2vasdk81pyl2k085miapd4l3jszz4fj"; + "Path.swift" = "05qk7kwb1254zwdxc3sjc3gprccnv9fwapmy5y6ygxjz8a6jfk83"; + "PromiseKit" = "0vlkd4famjgbd4qs2ldi5aqg13nk77h7ddsdigyxxzgkwgxl076d"; + "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0"; + "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9"; + "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8"; + "Version" = "0s5bwr1li6dnsnalfyraq1kzhqmmn9qwp1mld4msrn3q5vvjmql9"; + "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76"; + }; +} diff --git a/pkgs/development/tools/xcodes/generated/workspace-state.json b/pkgs/development/tools/xcodes/generated/workspace-state.json new file mode 100644 index 0000000000000..f13a3a54c6d4d --- /dev/null +++ b/pkgs/development/tools/xcodes/generated/workspace-state.json @@ -0,0 +1,194 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "data", + "kind": "remoteSourceControl", + "location": "https://github.com/xcodereleases/data", + "name": "XcodeReleases" + }, + "state": { + "checkoutState": { + "revision": "fcf527b187817f67c05223676341f3ab69d4214d" + }, + "name": "sourceControlCheckout" + }, + "subpath": "data" + }, + { + "basedOn": null, + "packageRef": { + "identity": "foundation", + "kind": "remoteSourceControl", + "location": "https://github.com/PromiseKit/Foundation.git", + "name": "PMKFoundation" + }, + "state": { + "checkoutState": { + "revision": "985f17fa69ee0e5b7eb3ff9be87ffc4e05fc0927", + "version": "3.4.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Foundation" + }, + { + "basedOn": null, + "packageRef": { + "identity": "keychainaccess", + "kind": "remoteSourceControl", + "location": "https://github.com/kishikawakatsumi/KeychainAccess.git", + "name": "KeychainAccess" + }, + "state": { + "checkoutState": { + "revision": "8d33ffd6f74b3bcfc99af759d4204c6395a3f918", + "version": "3.2.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "KeychainAccess" + }, + { + "basedOn": null, + "packageRef": { + "identity": "legibleerror", + "kind": "remoteSourceControl", + "location": "https://github.com/mxcl/LegibleError.git", + "name": "LegibleError" + }, + "state": { + "checkoutState": { + "revision": "909e9bab3ded97350b28a5ab41dd745dd8aa9710", + "version": "1.0.4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "LegibleError" + }, + { + "basedOn": null, + "packageRef": { + "identity": "path.swift", + "kind": "remoteSourceControl", + "location": "https://github.com/mxcl/Path.swift.git", + "name": "Path.swift" + }, + "state": { + "checkoutState": { + "revision": "dac007e907a4f4c565cfdc55a9ce148a761a11d5", + "version": "0.16.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Path.swift" + }, + { + "basedOn": null, + "packageRef": { + "identity": "promisekit", + "kind": "remoteSourceControl", + "location": "https://github.com/mxcl/PromiseKit.git", + "name": "PromiseKit" + }, + "state": { + "checkoutState": { + "revision": "1c296a8637838901d2b01e4c46875ee749506133", + "version": "6.8.5" + }, + "name": "sourceControlCheckout" + }, + "subpath": "PromiseKit" + }, + { + "basedOn": null, + "packageRef": { + "identity": "rainbow", + "kind": "remoteSourceControl", + "location": "https://github.com/onevcat/Rainbow.git", + "name": "Rainbow" + }, + "state": { + "checkoutState": { + "revision": "626c3d4b6b55354b4af3aa309f998fae9b31a3d9", + "version": "3.2.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Rainbow" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "9f39744e025c7d377987f30b03770805dcb0bcd1", + "version": "1.1.4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swiftsoup", + "kind": "remoteSourceControl", + "location": "https://github.com/scinfu/SwiftSoup.git", + "name": "SwiftSoup" + }, + "state": { + "checkoutState": { + "revision": "aeb5b4249c273d1783a5299e05be1b26e061ea81", + "version": "2.0.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "SwiftSoup" + }, + { + "basedOn": null, + "packageRef": { + "identity": "version", + "kind": "remoteSourceControl", + "location": "https://github.com/mxcl/Version.git", + "name": "Version" + }, + "state": { + "checkoutState": { + "revision": "087c91fedc110f9f833b14ef4c32745dabca8913", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Version" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6", + "version": "5.0.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 6 +} diff --git a/pkgs/misc/opensbi/default.nix b/pkgs/misc/opensbi/default.nix index e2a9600e2734a..347e7deb0d317 100644 --- a/pkgs/misc/opensbi/default.nix +++ b/pkgs/misc/opensbi/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "opensbi"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "riscv-software-src"; repo = "opensbi"; rev = "v${version}"; - hash = "sha256-JNkPvmKYd5xbGB2lsZKWrpI6rBIckWbkLYu98bw7+QY="; + hash = "sha256-T8ZeAzjM9aeTXitjE7s+m+jjGGtDo2jK1qO5EuKiVLU="; }; postPatch = '' @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { "FW_FDT_PATH=${withFDT}" ]; + enableParallelBuilding = true; + dontStrip = true; dontPatchELF = true; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index fe0d0ca63ea9a..a02445adb33b8 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -94,6 +94,7 @@ let Libsystem = callPackage ./libSystem.nix { }; LibsystemCross = pkgs.darwin.Libsystem; libcharset = callPackage ./libcharset.nix { }; + libcompression = callPackage ./libcompression.nix { }; libunwind = callPackage ./libunwind.nix { }; libnetwork = callPackage ./libnetwork.nix { }; libpm = callPackage ./libpm.nix { }; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libcompression.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libcompression.nix new file mode 100644 index 0000000000000..92a45b7c5a50c --- /dev/null +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libcompression.nix @@ -0,0 +1,20 @@ +{ stdenvNoCC, buildPackages, MacOSX-SDK }: + +let self = stdenvNoCC.mkDerivation { + pname = "libcompression"; + version = MacOSX-SDK.version; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/lib + cp ${MacOSX-SDK}/usr/lib/libcompression* $out/lib + ''; + + passthru = { + tbdRewrites = { + const."/usr/lib/libcompression.dylib" = "${self}/lib/libcompression.dylib"; + }; + }; +}; in self diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index f28cb28ef3730..46587028f2962 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pam, openssl, perl }: +{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, pam, openssl, perl }: stdenv.mkDerivation rec { pname = "pam_ssh_agent_auth"; @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.sudo = nixosTests.ssh-agent-auth; + meta = { homepage = "https://github.com/jbeverly/pam_ssh_agent_auth"; description = "PAM module for authentication through the SSH agent"; diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index c90096ca5a3c1..986fdd1300db3 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { tags = [ "release" ]; preBuild = '' - go generate ./... + GOOS= GOARCH= go generate ./... ''; passthru.tests.version = testers.testVersion { package = carapace; }; diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index 632da8db0a2bc..0fafd28ae3c29 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -14,17 +14,18 @@ , wlr-protocols , pulseaudio , config +, nixosTests }: stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2023-09-03"; + version = "unstable-2023-12-23"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "c4ea4d299aa1bbbcc972c04adf06c18245ce7674"; - hash = "sha256-Tp3yZb1nteOlz/KhydFdjBrj3OrY20s/Ltfk/EBrIyk="; + rev = "f9ae0c837bf8351037689f1985c1a52c1570ba30"; + hash = "sha256-wJWMdD9OmGybIwgBNJ8LxxV21L4SaV22OxAILsDWG3U="; }; enableParallelBuilding = true; @@ -56,7 +57,10 @@ stdenv.mkDerivation { installManPage drawterm.1 ''; - passthru.updateScript = unstableGitUpdater { shallowClone = false; }; + passthru = { + updateScript = unstableGitUpdater { shallowClone = false; }; + tests = nixosTests.drawterm; + }; meta = with lib; { description = "Connect to Plan 9 CPU servers from other operating systems."; diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index f2d65eb897e9c..132eda28ed308 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, beets, python3Packages }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication rec { pname = "beets-copyartifacts"; - version = "unstable-2020-02-15"; + version = "0.1.5"; src = fetchFromGitHub { repo = "beets-copyartifacts"; owner = "adammillerio"; - rev = "85eefaebf893cb673fa98bfde48406ec99fd1e4b"; - sha256 = "sha256-bkT2BZZ2gdcacgvyrVe2vMrOMV8iMAm8Q5xyrZzyqU0="; + rev = "v${version}"; + sha256 = "sha256-UTZh7T6Z288PjxFgyFxHnPt0xpAH3cnr8/jIrlJhtyU="; }; postPatch = '' @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication { meta = { description = "Beets plugin to move non-music files during the import process"; - homepage = "https://github.com/sbarakat/beets-copyartifacts"; + homepage = "https://github.com/adammillerio/beets-copyartifacts"; license = lib.licenses.mit; inherit (beets.meta) platforms; }; diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index c8121e8ffbaf3..5e4127214f567 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.4"; + version = "0.3.5"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-6tbCEvoOd97/rWC8XwKUS2FJXaB7PKReCctWRaYqUGU="; + hash = "sha256-2eBJghncgzIbQKItj0Qng5xwvh9BBHNMxlbjO+tUdVU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 084f1c2dfe21f..ccabc9b584446 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -14,19 +14,19 @@ , python3 , lua , opencc -, libsoup +, libsoup_3 , json-glib }: stdenv.mkDerivation rec { pname = "ibus-libpinyin"; - version = "1.15.3"; + version = "1.15.6"; src = fetchFromGitHub { owner = "libpinyin"; repo = "ibus-libpinyin"; rev = version; - hash = "sha256-6M4tgIpMQul3R8xI29vyPIWX0n6YItZhdVA8vT9FIRw="; + hash = "sha256-cfV/VBCVtwI4qDwuU2563jMjxQqDs7VXGxkFn4w8IqM="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { db lua opencc - libsoup + libsoup_3 json-glib ]; diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 53be29dcfa3c1..c8658994706a5 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , chafa , cmake +, darwin , dbus , dconf , ddcutil @@ -27,29 +28,17 @@ , xfce , yyjson , zlib -, Apple80211 -, AppKit -, Cocoa -, CoreDisplay -, CoreVideo -, CoreWLAN -, DisplayServices -, Foundation -, IOBluetooth -, MediaRemote -, OpenCL -, moltenvk }: stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-jZeecymhjbXYE05zRF2dWHBS3hhRm1BmLB906YAlp+A="; + hash = "sha256-LHRbobgBXGjoLQXC+Gy03aNrTyjn1loVMbj0qv3HObQ="; }; nativeBuildInputs = [ @@ -83,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { xfce.xfconf zlib ] - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Apple80211 AppKit Cocoa @@ -91,12 +80,12 @@ stdenv.mkDerivation (finalAttrs: { CoreVideo CoreWLAN DisplayServices - Foundation IOBluetooth MediaRemote OpenCL - moltenvk - ]; + SystemConfiguration + darwin.moltenvk + ]); cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index c9c1caff8018c..eeb05dd4012eb 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2023.11.16"; + version = "2023.12.30"; src = fetchPypi { inherit pname version; - hash = "sha256-8Mza8S4IsVkCYBpGccerEpBtexHeOudfplBoEcJOxdo="; + hash = "sha256-oRhi5XchsKDwiD3+taTXm6ITotTEXhiA6f1w+OZXDDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 58250f5320a7e..3156eba3551ed 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.12.1"; + version = "9.12.2"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-U3iEiKIb9lTNM4GK75a8khsjeZzYaMafoBfdpNiiwHQ="; + hash = "sha256-pFXQkYIMheo9W86nwNifN9Ckrk2v+FmpoUsDnIRcuYU="; }; proxyVendor = true; - vendorHash = "sha256-RRE0DsBkpI9hvo7k04eIadOKO3YE0g0DDjFj40ya1ZM="; + vendorHash = "sha256-TW5mQjuxKbYLRdpNdFOZbb0/Y2lnKgQWXeAyUilQq/4="; subPackages = [ "apps/cnspec" diff --git a/pkgs/tools/text/mdbook-pagetoc/default.nix b/pkgs/tools/text/mdbook-pagetoc/default.nix index 74e88c8ef358e..5e9738c1c1400 100644 --- a/pkgs/tools/text/mdbook-pagetoc/default.nix +++ b/pkgs/tools/text/mdbook-pagetoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-pagetoc"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "slowsage"; repo = pname; rev = "v${version}"; - hash = "sha256-rhg/QDdO44Qwb/z1tQEYK5DcGuUI6cQvpHTYmqYyoWY="; + hash = "sha256-yFgzgppGX3moLt7X4Xa6Cqs7v5OYJMjXKTV0sqRFL3o="; }; - cargoHash = "sha256-03/bLFbP+BSfRW6wyg7LnryDP0kqvfvYqrFBKFZ2xY8="; + cargoHash = "sha256-U5KNkUXqCU3cVYOqap19aYpaTyY91kGaGxcW8oxsUxI="; meta = with lib; { description = "Table of contents for mdbook (in sidebar)"; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 5c8427679c82d..af42afde1158f 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -7,10 +7,12 @@ , Security , withPCRE2 ? true , pcre2 -, enableManpages ? stdenv.hostPlatform.emulatorAvailable buildPackages }: -rustPlatform.buildRustPackage rec { +let + canRunRg = stdenv.hostPlatform.emulatorAvailable buildPackages; + rg = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/rg"; +in rustPlatform.buildRustPackage rec { pname = "ripgrep"; version = "14.0.3"; @@ -30,24 +32,24 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional withPCRE2 "pcre2"; - preFixup = lib.optionalString enableManpages '' - ${stdenv.hostPlatform.emulator buildPackages} $out/bin/rg --generate man > rg.1 + preFixup = lib.optionalString canRunRg '' + ${rg} --generate man > rg.1 installManPage rg.1 - '' + '' + installShellCompletion --cmd rg \ - --bash <($out/bin/rg --generate complete-bash) \ - --fish <($out/bin/rg --generate complete-fish) \ - --zsh <($out/bin/rg --generate complete-zsh) + --bash <(${rg} --generate complete-bash) \ + --fish <(${rg} --generate complete-fish) \ + --zsh <(${rg} --generate complete-zsh) ''; doInstallCheck = true; installCheckPhase = '' file="$(mktemp)" echo "abc\nbcd\ncde" > "$file" - $out/bin/rg -N 'bcd' "$file" - $out/bin/rg -N 'cd' "$file" + ${rg} -N 'bcd' "$file" + ${rg} -N 'cd' "$file" '' + lib.optionalString withPCRE2 '' - echo '(a(aa)aa)' | $out/bin/rg -P '\((a*|(?R))*\)' + echo '(a(aa)aa)' | ${rg} -P '\((a*|(?R))*\)' ''; meta = with lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 174f613930dc8..3ed784f6834f7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1054,8 +1054,10 @@ mapAliases ({ yacc = bison; # moved from top-level 2021-03-14 yafaray-core = libyafaray; # Added 2022-09-23 yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 - yuzu-ea = yuzu-early-access; # Added 2022-08-18 - yuzu = yuzu-mainline; # Added 2021-01-25 + yuzu-ea = yuzuPackages.early-access; # Added 2022-08-18 + yuzu-early-access = yuzuPackages.early-access; # Added 2023-12-29 + yuzu = yuzuPackages.mainline; # Added 2021-01-25 + yuzu-mainline = yuzuPackages.mainline; # Added 2023-12-29 ### Z ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 056bada2b3438..f54b92a36862d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1804,12 +1804,8 @@ with pkgs; etlegacy = callPackage ../games/etlegacy { lua = lua5_4; }; - fastfetch = darwin.apple_sdk_11_0.callPackage ../tools/misc/fastfetch { - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit Apple80211 Cocoa CoreDisplay CoreVideo CoreWLAN DisplayServices - Foundation IOBluetooth MediaRemote OpenCL; - - inherit (darwin) moltenvk; + fastfetch = callPackage ../tools/misc/fastfetch { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; fscan = callPackage ../tools/security/fscan { }; @@ -2747,8 +2743,6 @@ with pkgs; hatari = callPackage ../applications/emulators/hatari { }; - hercules = callPackage ../applications/emulators/hercules { }; - hostapd-mana = callPackage ../tools/networking/hostapd-mana { }; image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; @@ -2949,16 +2943,7 @@ with pkgs; callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; ### APPLICATIONS/EMULATORS/YUZU - - yuzu-mainline = import ../applications/emulators/yuzu { - inherit qt6Packages fetchFromGitHub fetchgit fetchurl fetchzip runCommand gnutar; - branch = "mainline"; - }; - - yuzu-early-access = import ../applications/emulators/yuzu { - inherit qt6Packages fetchFromGitHub fetchgit fetchurl fetchzip runCommand gnutar; - branch = "early-access"; - }; + yuzuPackages = callPackage ../applications/emulators/yuzu {}; ### APPLICATIONS/EMULATORS/COMMANDERX16 @@ -4189,7 +4174,10 @@ with pkgs; xcodeenv = callPackage ../development/mobile/xcodeenv { }; - xcodes = callPackage ../development/tools/xcodes { }; + xcodes = swiftPackages.callPackage ../development/tools/xcodes { + inherit (swiftPackages.apple_sdk.frameworks) CryptoKit LocalAuthentication; + inherit (swiftPackages.apple_sdk) libcompression; + }; gomobile = callPackage ../development/mobile/gomobile { }; @@ -31338,9 +31326,7 @@ with pkgs; electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; - elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { - libdwarf = libdwarf_20210528; - }; + elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; elfx86exts = callPackage ../applications/misc/elfx86exts { }; @@ -34067,8 +34053,6 @@ with pkgs; nwg-wrapper = callPackage ../applications/misc/nwg-wrapper { }; - ocenaudio = callPackage ../applications/audio/ocenaudio { }; - ocm = callPackage ../applications/networking/cluster/ocm { }; odo = callPackage ../applications/networking/cluster/odo { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5fe0e98b9a2d3..e816cfe2a9a78 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -221,6 +221,7 @@ mapAliases ({ Keras = keras; # added 2021-11-25 ldap = python-ldap; # added 2022-09-16 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 + langchainplus-sdk = langsmith; # added 2023-08-01 lazr_config = lazr-config; # added 2023-11-03 lazr_delegates = lazr-delegates; # added 2023-11-03 lazy_imports = lazy-imports; # added 2023-10-13 @@ -476,6 +477,7 @@ mapAliases ({ zope_contenttype = zope-contenttype; # added 2023-10-11 zope_deprecation = zope-deprecation; # added 2023-10-07 zope_dottedname = zope-dottedname; # added 2023-11-12 + zope_exceptions = zope-exceptions; # added 2023-10-11 zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29 zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11 zope_proxy = zope-proxy; # added 2023-10-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index db4076b7e53bc..590b897eb2ac4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -624,6 +624,8 @@ self: super: with self; { apispec-webframeworks = callPackage ../development/python-modules/apispec-webframeworks { }; + apkinspector = callPackage ../development/python-modules/apkinspector { }; + apkit = callPackage ../development/python-modules/apkit { }; aplpy = callPackage ../development/python-modules/aplpy { }; @@ -6153,8 +6155,6 @@ self: super: with self; { langchain = callPackage ../development/python-modules/langchain { }; - langchainplus-sdk = callPackage ../development/python-modules/langchainplus-sdk { }; - langcodes = callPackage ../development/python-modules/langcodes { }; langdetect = callPackage ../development/python-modules/langdetect { }; @@ -10586,6 +10586,8 @@ self: super: with self; { pylast = callPackage ../development/python-modules/pylast { }; + pylatex = callPackage ../development/python-modules/pylatex { }; + pylatexenc = callPackage ../development/python-modules/pylatexenc { }; pylaunches = callPackage ../development/python-modules/pylaunches { }; @@ -16443,7 +16445,7 @@ self: super: with self; { zope_event = callPackage ../development/python-modules/zope_event { }; - zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; + zope-exceptions = callPackage ../development/python-modules/zope-exceptions { }; zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; |