diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-26 18:00:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-26 18:00:58 +0000 |
commit | 037c0663b9d1eaf1fbeffede5b8e9acd99569b9c (patch) | |
tree | 7a67bcdaf4170deb7b51c5b148bfb65f4440d732 /pkgs/by-name | |
parent | 7ac1647abc383ad3d6c59cfb57519294d5809143 (diff) | |
parent | 1d67e14da5e03eba8c84ba963d0dd7fa50024b54 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/by-name')
-rw-r--r-- | pkgs/by-name/al/altdns/package.nix | 53 | ||||
-rw-r--r-- | pkgs/by-name/ff/fflogs/package.nix | 37 | ||||
-rw-r--r-- | pkgs/by-name/go/go-camo/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/gr/graphene-hardened-malloc/package.nix | 108 | ||||
-rw-r--r-- | pkgs/by-name/hu/hugo/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/li/livekit-cli/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/me/melonDS/package.nix | 93 | ||||
-rw-r--r-- | pkgs/by-name/ot/oterm/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/py/pyprland/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/ri/ripsecrets/package.nix | 6 | ||||
-rw-r--r-- | pkgs/by-name/so/soupault/package.nix | 10 | ||||
-rw-r--r-- | pkgs/by-name/ve/vesktop/package.nix | 2 |
12 files changed, 310 insertions, 23 deletions
diff --git a/pkgs/by-name/al/altdns/package.nix b/pkgs/by-name/al/altdns/package.nix new file mode 100644 index 0000000000000..839173efa64d6 --- /dev/null +++ b/pkgs/by-name/al/altdns/package.nix @@ -0,0 +1,53 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication { + pname = "altdns"; + version = "1.0.2-unstable-2021-09-09"; + pyproject = true; + + src = fetchFromGitHub { + owner = "infosec-au"; + repo = "altdns"; + rev = "8c1de0fa8365153832bb58d74475caa15d2d077a"; + hash = "sha256-ElY6AZ7IBnOh7sRWNSQNmq7AYGlnjvYRn8/U+29BwWA="; + }; + + prePatch = '' + substituteInPlace requirements.txt \ + --replace-fail "argparse" "" + substituteInPlace setup.py \ + --replace-fail "argparse" "" + ''; + + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = with python3.pkgs; [ + dnspython + termcolor + tldextract + ]; + + postInstall = '' + cp $src/words.txt $out/ + ''; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "altdns" + ]; + + meta = with lib; { + description = "Generates permutations, alterations and mutations of subdomains and then resolves them"; + homepage = "https://github.com/infosec-au/altdns"; + license = licenses.asl20; + maintainers = with maintainers; [ octodi ]; + mainProgram = "altdns"; + }; +} diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix new file mode 100644 index 0000000000000..964805a549a54 --- /dev/null +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -0,0 +1,37 @@ +{ lib +, appimageTools +, fetchurl +}: + +let + pname = "fflogs"; + version = "8.3.42"; + src = fetchurl { + url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; + hash = "sha256-Bc4C1cOOHdWkw2mHn3Q/2fcKuyCFDvOq1jLee2WPsyI="; + }; + extracted = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mkdir -p $out/share/applications + cp -r ${extracted}/usr/share/icons $out/share/ + chmod -R +w $out/share/ + mv $out/share/icons/hicolor/0x0 $out/share/icons/hicolor/512x512 # https://github.com/electron-userland/electron-builder/issues/5294 + cp ${extracted}/fflogs.desktop $out/share/applications/ + sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop + ''; + + meta = with lib; { + description = "An application for uploading Final Fantasy XIV combat logs to fflogs.com"; + homepage = "https://www.fflogs.com/client/download"; + downloadPage = "https://github.com/RPGLogs/Uploaders-fflogs/releases/latest"; + license = licenses.unfree; # no license listed + mainProgram = "fflogs"; + platforms = platforms.linux; + maintainers = with maintainers; [ sersorrel ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index e90fa676cbd4d..677a64b705808 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.12"; + version = "2.4.13"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rlzAx6xjV4JR3RDL+Kr2ghN3qpfIRqVZ5z/SyDBBaIc="; + sha256 = "sha256-nrkc+uYgPES3CfRjmfH/9eM6NL8Vo3kUBX9JHEw/1C4="; }; vendorHash = "sha256-iyZNOooPH1jvT+S9/ETRoXsTwXUIUi1UKmDzhB7NRuE="; diff --git a/pkgs/by-name/gr/graphene-hardened-malloc/package.nix b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix new file mode 100644 index 0000000000000..c92fc2c398cff --- /dev/null +++ b/pkgs/by-name/gr/graphene-hardened-malloc/package.nix @@ -0,0 +1,108 @@ +{ fetchFromGitHub +, lib +, makeWrapper +, python3 +, runCommand +, stdenv +, stress-ng +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "graphene-hardened-malloc"; + version = "2024040900"; + + src = fetchFromGitHub { + owner = "GrapheneOS"; + repo = "hardened_malloc"; + rev = finalAttrs.version; + sha256 = "sha256-1j7xzhuhK8ZRAJm9dJ95xiTIla7lh3LBiWc/+x/kjp0="; + }; + + nativeCheckInputs = [ python3 ]; + # these tests cover use as a build-time-linked library + checkTarget = "test"; + doCheck = true; + + buildPhase = '' + runHook preBuild + + for VARIANT in default light; do make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} VARIANT=$VARIANT; done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/include include/* + install -Dm444 -t $out/lib out/libhardened_malloc.so out-light/libhardened_malloc-light.so + + mkdir -p $out/bin + substitute preload.sh $out/bin/preload-hardened-malloc --replace "\$dir" $out/lib + chmod 0555 $out/bin/preload-hardened-malloc + + runHook postInstall + ''; + + separateDebugInfo = true; + + passthru = { + ld-preload-tests = stdenv.mkDerivation { + name = "${finalAttrs.pname}-ld-preload-tests"; + inherit (finalAttrs) src; + + nativeBuildInputs = [ makeWrapper ]; + + # reuse the projects tests to cover use with LD_PRELOAD. we have + # to convince the test programs to build as though they're naive + # standalone executables. this includes disabling tests for + # malloc_object_size, which doesn't make sense to use via LD_PRELOAD. + buildPhase = '' + pushd test + make LDLIBS= LDFLAGS=-Wl,--unresolved-symbols=ignore-all CXXFLAGS=-lstdc++ + substituteInPlace test_smc.py \ + --replace 'test_malloc_object_size' 'dont_test_malloc_object_size' \ + --replace 'test_invalid_malloc_object_size' 'dont_test_invalid_malloc_object_size' + popd # test + ''; + + installPhase = '' + mkdir -p $out/test + cp -r test $out/test + + mkdir -p $out/bin + makeWrapper ${python3.interpreter} $out/bin/run-tests \ + --add-flags "-I -m unittest discover --start-directory $out/test" + ''; + }; + tests = { + ld-preload = runCommand "ld-preload-test-run" { } '' + ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${finalAttrs.passthru.ld-preload-tests}/bin/run-tests + touch $out + ''; + # to compensate for the lack of tests of correct normal malloc operation + stress = runCommand "stress-test-run" { } '' + ${finalAttrs.finalPackage}/bin/preload-hardened-malloc ${stress-ng}/bin/stress-ng \ + --no-rand-seed \ + --malloc 8 \ + --malloc-ops 1000000 \ + --verify + touch $out + ''; + }; + }; + + meta = with lib; { + homepage = "https://github.com/GrapheneOS/hardened_malloc"; + description = "Hardened allocator designed for modern systems"; + mainProgram = "preload-hardened-malloc"; + longDescription = '' + This is a security-focused general purpose memory allocator providing the malloc API + along with various extensions. It provides substantial hardening against heap + corruption vulnerabilities yet aims to provide decent overall performance. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +}) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 1fa25ad356eb9..9d5e94fa25543 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.125.3"; + version = "0.125.4"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-PZTV/VM0KS/vM4lLrJ/XPvNi33lM+L0gITQHGpjdN+4="; + hash = "sha256-oeOP9UoiAGwYR2Vzr5IZrLfYA3EQJ9j6Bzh7C12pA+c="; }; - vendorHash = "sha256-jGCHlAE5mSDKpZVWgjCEN51sL+3GR/C5ROI9065OhRU="; + vendorHash = "sha256-L8+e6rZvFaNV9gyWJtXv9NnzoigVDSyNKTuxGrRwb44="; doCheck = false; diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix index 686f58800345c..fe276c14c3434 100644 --- a/pkgs/by-name/li/livekit-cli/package.nix +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit-cli"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit-cli"; rev = "v${version}"; - hash = "sha256-6UIMyroZpylUMG7TIBOqDIDsuJLtpe2BQxfjEhbZBGc="; + hash = "sha256-IARQ5yxktem729SrxdT5i+7+1dY60xw+2KZU+unlsKM="; }; - vendorHash = "sha256-e84jusaQx6B5cbJoIOSVyxgAQx9VIxFODH1Io1Z/yj0="; + vendorHash = "sha256-3ePOwEEPexM+k0atW/mW4yNVtnsEXwv1w5NVQLyexbs="; subPackages = [ "cmd/livekit-cli" ]; diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix new file mode 100644 index 0000000000000..334b5909496c7 --- /dev/null +++ b/pkgs/by-name/me/melonDS/package.nix @@ -0,0 +1,93 @@ +{ lib +, SDL2 +, cmake +, extra-cmake-modules +, fetchFromGitHub +, libGL +, libarchive +, libpcap +, libsForQt5 +, libslirp +, pkg-config +, stdenv +, unstableGitUpdater +, wayland +, zstd +}: + +let + inherit (libsForQt5) + qtbase + qtmultimedia + wrapQtAppsHook; +in +stdenv.mkDerivation (finalAttrs: { + pname = "melonDS"; + version = "0.9.5-unstable-2024-04-18"; + + src = fetchFromGitHub { + owner = "melonDS-emu"; + repo = "melonDS"; + rev = "ba8d547dfa81539f4e8474152d92e866ad89241b"; + hash = "sha256-va4KegM2z0GSA43goUynRPNPvQnrV2b8oNOfLKPE+Zc="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + SDL2 + extra-cmake-modules + libarchive + libslirp + libGL + qtbase + qtmultimedia + wayland + zstd + ]; + + strictDeps = true; + + qtWrapperArgs = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" + ]; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + homepage = "https://melonds.kuribo64.net/"; + description = "Work in progress Nintendo DS emulator"; + longDescription = '' + melonDS aims at providing fast and accurate Nintendo DS emulation. While + it is still a work in progress, it has a pretty solid set of features: + + - Nearly complete core (CPU, video, audio, ...) + - JIT recompiler for fast emulation + - OpenGL renderer, 3D upscaling + - RTC, microphone, lid close/open + - Joystick support + - Savestates + - Various display position/sizing/rotation modes + - (WIP) Wifi: local multiplayer, online connectivity + - (WIP) DSi emulation + - DLDI + - (WIP) GBA slot add-ons + - and more are planned! + ''; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "melonDS"; + maintainers = with lib.maintainers; [ + AndersonTorres + artemist + benley + shamilton + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index 00c9d594179c1..75220b2f69dcb 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "oterm"; - version = "0.2.6"; + version = "0.2.7"; pyproject = true; src = fetchFromGitHub { owner = "ggozad"; repo = "oterm"; rev = "refs/tags/${version}"; - hash = "sha256-I/0U4lYqYZ6QCmWbDYhSOTCQ8o09W2cdd8kW7iN9iHU="; + hash = "sha256-vKVGSIneKQkFO1uoNaW/Yr6QTDhgokmIpkYFYIbm+U4="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 11a9f99af9c81..df30822582485 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.2.10"; + version = "2.2.12"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-SOrkOLSjXq8PlZ894EKjfN+Dfnwa8dRgh5eOJVeD2Mk="; + hash = "sha256-SVly20/+67d0Rr2SuM1n/JfT1SlyKdKRBLDx2okCZRY="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix index d578a13eadaa2..540eb3a8d9e5d 100644 --- a/pkgs/by-name/ri/ripsecrets/package.nix +++ b/pkgs/by-name/ri/ripsecrets/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ripsecrets"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "sirwart"; repo = "ripsecrets"; rev = "v${version}"; - hash = "sha256-NDSMxIq6eBXOv/mI662vsIIOfWQEzQ5fDGznC4+gFyE="; + hash = "sha256-MyFeSEZAG99g1Uh8KVA7CSZZVXUOF2qYJ0o1YviiPp4="; }; - cargoHash = "sha256-vp2gQUf6TWFkJ09STOlqlEB+jsGrVGAmix2eSgBDG/o="; + cargoHash = "sha256-BKq1ttf8ctXvIbhKxHwCpjeiRKqSyN5+kP2k4CV511I="; meta = with lib; { description = "A command-line tool to prevent committing secret keys into your source code"; diff --git a/pkgs/by-name/so/soupault/package.nix b/pkgs/by-name/so/soupault/package.nix index f14774c4865ad..a3d9257d3e310 100644 --- a/pkgs/by-name/so/soupault/package.nix +++ b/pkgs/by-name/so/soupault/package.nix @@ -7,13 +7,9 @@ , testers }: -let +ocamlPackages.buildDunePackage rec { pname = "soupault"; - - version = "4.9.0"; -in -ocamlPackages.buildDunePackage { - inherit pname version; + version = "4.10.0"; minimalOCamlVersion = "4.13"; @@ -22,7 +18,7 @@ ocamlPackages.buildDunePackage { "https://github.com/PataphysicalSociety/soupault/archive/${version}.tar.gz" "https://codeberg.org/PataphysicalSociety/soupault/archive/${version}.tar.gz" ]; - hash = "sha256-vGTJUbAeYs/EYFykNSmCc4c9G66/Lz3BsUYnZQ8feFo="; + hash = "sha256-mkbRWw4Qj7pk2MQJERA9cAuC8DXD/fOShVXz2zPtXZ4="; }; nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ darwin.sigtool ]; diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 980258ed863a4..d3952f621a123 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${electron}/bin/electron $out/bin/vesktop \ --add-flags $out/opt/Vesktop/resources/app.asar \ ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" runHook postInstall ''; |