Merge master into staging-next

authored by nixpkgs-ci[bot] and committed by GitHub 8ef584d8 6f8ef929

+142 -98
+7 -12
pkgs/applications/audio/radiotray-ng/default.nix
··· 2 lib, 3 stdenv, 4 fetchFromGitHub, 5 - fetchpatch, 6 cmake, 7 pkg-config, 8 # Transport ··· 51 in 52 stdenv.mkDerivation rec { 53 pname = "radiotray-ng"; 54 - version = "0.2.8"; 55 56 src = fetchFromGitHub { 57 owner = "ebruck"; 58 repo = pname; 59 - rev = "v${version}"; 60 - sha256 = "sha256-/0GlQdSsIPKGrDT9CgxvaH8TpAbqxFduwL2A2+BSrEI="; 61 }; 62 63 nativeBuildInputs = [ ··· 89 90 patches = [ 91 ./no-dl-googletest.patch 92 - (fetchpatch { 93 - name = "gcc13-fixes.patch"; 94 - url = "https://github.com/ebruck/radiotray-ng/commit/7a99bfa784f77be8f160961d25ab63dc2d5ccde0.patch"; 95 - hash = "sha256-7x3v0dp9WPgd/vsnxezgXIZGsBrIHkTwIiu+FMlLmyA="; 96 - }) 97 ]; 98 99 postPatch = '' ··· 124 wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH 125 ''; 126 127 - meta = with lib; { 128 description = "Internet radio player for linux"; 129 homepage = "https://github.com/ebruck/radiotray-ng"; 130 - license = licenses.gpl3; 131 maintainers = [ ]; 132 - platforms = platforms.linux; 133 }; 134 }
··· 2 lib, 3 stdenv, 4 fetchFromGitHub, 5 cmake, 6 pkg-config, 7 # Transport ··· 50 in 51 stdenv.mkDerivation rec { 52 pname = "radiotray-ng"; 53 + version = "0.2.9"; 54 55 src = fetchFromGitHub { 56 owner = "ebruck"; 57 repo = pname; 58 + tag = "v${version}"; 59 + hash = "sha256-rRD/IfVnOxowr2mO2BB2hcHK5ByZSmTbcgYdULogYUs="; 60 }; 61 62 nativeBuildInputs = [ ··· 88 89 patches = [ 90 ./no-dl-googletest.patch 91 + ./tests-c++17.patch 92 ]; 93 94 postPatch = '' ··· 119 wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH 120 ''; 121 122 + meta = { 123 description = "Internet radio player for linux"; 124 homepage = "https://github.com/ebruck/radiotray-ng"; 125 + license = lib.licenses.gpl3; 126 maintainers = [ ]; 127 + platforms = lib.platforms.linux; 128 }; 129 }
+9 -22
pkgs/applications/audio/radiotray-ng/no-dl-googletest.patch
··· 1 - From b6f7a9e2e0194c6baed63a33b7beff359080b8d9 Mon Sep 17 00:00:00 2001 2 - From: Will Dietz <w@wdtz.org> 3 - Date: Sat, 16 Mar 2019 11:40:00 -0500 4 - Subject: [PATCH] don't download googletest 5 - 6 - --- 7 - CMakeLists.txt | 18 ------------------ 8 - tests/CMakeLists.txt | 1 - 9 - 2 files changed, 19 deletions(-) 10 - 11 diff --git a/CMakeLists.txt b/CMakeLists.txt 12 - index ddba1be..3396705 100644 13 --- a/CMakeLists.txt 14 +++ b/CMakeLists.txt 15 - @@ -70,25 +70,7 @@ endif() 16 - 17 # build tests? Then we need googletest... 18 if (BUILD_TESTS) 19 - include(ExternalProject) 20 - 21 - ExternalProject_Add(googletest 22 - PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest" 23 - - URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz 24 - - URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c 25 - TIMEOUT 30 26 - DOWNLOAD_NO_PROGRESS true 27 - INSTALL_COMMAND "") ··· 29 - ExternalProject_Get_Property(googletest SOURCE_DIR) 30 - include_directories(${SOURCE_DIR}/googlemock/include ${SOURCE_DIR}/googletest/include) 31 - ExternalProject_Get_Property(googletest BINARY_DIR) 32 - - link_directories(${BINARY_DIR}/googlemock ${BINARY_DIR}/googlemock/gtest) 33 set(GMOCK_BOTH_LIBRARIES gmock_main gmock gtest) 34 - set_property(DIRECTORY PROPERTY CLEAN_NO_CUSTOM "${CMAKE_CURRENT_BINARY_DIR}/googletest") 35 - unset(SOURCE_DIR) 36 - unset(BINARY_DIR) 37 - - 38 enable_testing() 39 add_subdirectory(tests) 40 - add_subdirectory(tests/runners/) 41 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt 42 index 859c048..58ab5c2 100644 43 --- a/tests/CMakeLists.txt 44 +++ b/tests/CMakeLists.txt 45 @@ -2,7 +2,6 @@ include(GoogleTest) 46 - 47 function(add_gmock_test target) 48 add_executable(${target} ${ARGN}) 49 - add_dependencies(${target} googletest) 50 target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread) 51 target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS}) 52 gtest_discover_tests(${target}) 53 - -- 54 - 2.22.0 55 -
··· 1 diff --git a/CMakeLists.txt b/CMakeLists.txt 2 + index 5338579..a28e58f 100644 3 --- a/CMakeLists.txt 4 +++ b/CMakeLists.txt 5 + @@ -92,25 +92,7 @@ endif() 6 + 7 # build tests? Then we need googletest... 8 if (BUILD_TESTS) 9 - include(ExternalProject) 10 - 11 - ExternalProject_Add(googletest 12 - PREFIX "${CMAKE_CURRENT_BINARY_DIR}/googletest" 13 + - URL https://github.com/google/googletest/releases/download/v1.15.2/googletest-1.15.2.tar.gz 14 + - URL_HASH SHA256=7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926 15 + - DOWNLOAD_EXTRACT_TIMESTAMP true 16 - TIMEOUT 30 17 - DOWNLOAD_NO_PROGRESS true 18 - INSTALL_COMMAND "") ··· 20 - ExternalProject_Get_Property(googletest SOURCE_DIR) 21 - include_directories(${SOURCE_DIR}/googlemock/include ${SOURCE_DIR}/googletest/include) 22 - ExternalProject_Get_Property(googletest BINARY_DIR) 23 + - link_directories(${BINARY_DIR}/lib) 24 set(GMOCK_BOTH_LIBRARIES gmock_main gmock gtest) 25 - set_property(DIRECTORY PROPERTY CLEAN_NO_CUSTOM "${CMAKE_CURRENT_BINARY_DIR}/googletest") 26 - unset(SOURCE_DIR) 27 - unset(BINARY_DIR) 28 + 29 enable_testing() 30 add_subdirectory(tests) 31 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt 32 index 859c048..58ab5c2 100644 33 --- a/tests/CMakeLists.txt 34 +++ b/tests/CMakeLists.txt 35 @@ -2,7 +2,6 @@ include(GoogleTest) 36 + 37 function(add_gmock_test target) 38 add_executable(${target} ${ARGN}) 39 - add_dependencies(${target} googletest) 40 target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread) 41 target_include_directories(${target} PRIVATE ${JSONCPP_INCLUDE_DIRS}) 42 gtest_discover_tests(${target})
+25
pkgs/applications/audio/radiotray-ng/tests-c++17.patch
···
··· 1 + diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt 2 + index 58ab5c2..4f56a25 100644 3 + --- a/tests/CMakeLists.txt 4 + +++ b/tests/CMakeLists.txt 5 + @@ -1,5 +1,7 @@ 6 + include(GoogleTest) 7 + 8 + +set(CMAKE_CXX_STANDARD 17) 9 + + 10 + function(add_gmock_test target) 11 + add_executable(${target} ${ARGN}) 12 + target_link_libraries(${target} config playlist bookmarks event_bus ${GMOCK_BOTH_LIBRARIES} ${XDG_BASEDIR_LIBRARIES} ${Boost_LIBRARIES} ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} pthread) 13 + diff --git a/tests/bookmarks_test.cpp b/tests/bookmarks_test.cpp 14 + index 2d72356..97f898a 100644 15 + --- a/tests/bookmarks_test.cpp 16 + +++ b/tests/bookmarks_test.cpp 17 + @@ -215,7 +215,7 @@ TEST(Bookmarks, test_that_stations_are_added_and_removed_from_a_group_and_moved) 18 + ASSERT_FALSE(bm[0].stations[0].notifications); 19 + 20 + // vector only throws when using at() 21 + - EXPECT_THROW(bm[0].stations.at(100), std::out_of_range); 22 + + EXPECT_THROW(static_cast<void>(bm[0].stations.at(100)), std::out_of_range); 23 + EXPECT_THROW(bm[1], std::out_of_range); 24 + } 25 +
+3 -3
pkgs/by-name/ap/api-linter/package.nix
··· 6 7 buildGoModule rec { 8 pname = "api-linter"; 9 - version = "1.69.2"; 10 11 src = fetchFromGitHub { 12 owner = "googleapis"; 13 repo = "api-linter"; 14 tag = "v${version}"; 15 - hash = "sha256-eLs5F3wghAfPfRQgAtW220xlzs7Un8sPpRpfvzc8Jfw="; 16 }; 17 18 - vendorHash = "sha256-wQQGQHz7Z8iSaDbfGWR/MazCo27uLycN0rKerRqzCDc="; 19 20 subPackages = [ "cmd/api-linter" ]; 21
··· 6 7 buildGoModule rec { 8 pname = "api-linter"; 9 + version = "1.70.0"; 10 11 src = fetchFromGitHub { 12 owner = "googleapis"; 13 repo = "api-linter"; 14 tag = "v${version}"; 15 + hash = "sha256-1OBsNuQuCxm+79K29NBwJ0Mj+kLiSEQSZk6Ovrh5sQY="; 16 }; 17 18 + vendorHash = "sha256-WfSr70YA6klj3iNQl1mLzpzJGGvybfFPkxaB4jBdsTg="; 19 20 subPackages = [ "cmd/api-linter" ]; 21
+3 -3
pkgs/by-name/ca/cargo-expand/package.nix
··· 6 7 rustPlatform.buildRustPackage rec { 8 pname = "cargo-expand"; 9 - version = "1.0.110"; 10 11 src = fetchFromGitHub { 12 owner = "dtolnay"; 13 repo = "cargo-expand"; 14 rev = version; 15 - hash = "sha256-7D2KFz5qI59YvV9+h1CLb92q6XD+wY7N0NjrFlH764s="; 16 }; 17 18 useFetchCargoVendor = true; 19 - cargoHash = "sha256-0z2fywRAmuK/K4Q6ZlvF0B4J65CYMl3NHPMXB9iHr2o="; 20 21 meta = { 22 description = "Cargo subcommand to show result of macro expansion";
··· 6 7 rustPlatform.buildRustPackage rec { 8 pname = "cargo-expand"; 9 + version = "1.0.113"; 10 11 src = fetchFromGitHub { 12 owner = "dtolnay"; 13 repo = "cargo-expand"; 14 rev = version; 15 + hash = "sha256-u5AQR0kMTNb6x1x7rvtF1jCne9Nqbkl7oiD9rkwhdRE="; 16 }; 17 18 useFetchCargoVendor = true; 19 + cargoHash = "sha256-TdzccMtXp5/KeYiO+vdukMO3hllBNeZAtO66eAUdbgA="; 20 21 meta = { 22 description = "Cargo subcommand to show result of macro expansion";
+3 -3
pkgs/by-name/fr/framac/package.nix
··· 46 47 stdenv.mkDerivation rec { 48 pname = "frama-c"; 49 - version = "30.0"; 50 - slang = "Zinc"; 51 52 src = fetchurl { 53 url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; 54 - hash = "sha256-OsD5lSYeyCmnvQQr9w/CmsY3kCnrnfMLzARHSOtNKlY="; 55 }; 56 57 preConfigure = ''
··· 46 47 stdenv.mkDerivation rec { 48 pname = "frama-c"; 49 + version = "31.0"; 50 + slang = "Gallium"; 51 52 src = fetchurl { 53 url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; 54 + hash = "sha256-qUOE8A1TeRy7S02Dq0Fge8cZYtQkYfAtcRFsT/bcpWc="; 55 }; 56 57 preConfigure = ''
+3 -3
pkgs/by-name/gh/gh/package.nix
··· 10 11 buildGoModule rec { 12 pname = "gh"; 13 - version = "2.75.0"; 14 15 src = fetchFromGitHub { 16 owner = "cli"; 17 repo = "cli"; 18 tag = "v${version}"; 19 - hash = "sha256-nxGCNwSC/vDETSRhwE4AY/wVysCFPPk9Y915gBLkjM8="; 20 }; 21 22 - vendorHash = "sha256-HbcMoQsvYf1ffQPpe7KQVF2vXv5eNiYFuknKPYIgn2U="; 23 24 nativeBuildInputs = [ installShellFiles ]; 25
··· 10 11 buildGoModule rec { 12 pname = "gh"; 13 + version = "2.75.1"; 14 15 src = fetchFromGitHub { 16 owner = "cli"; 17 repo = "cli"; 18 tag = "v${version}"; 19 + hash = "sha256-NZcU7ai/Tvg8j65w7qA5FY21R8M8az9tjDTu8YBhV4w="; 20 }; 21 22 + vendorHash = "sha256-go5hB6vjZZrTa3PMHWpv+J0yNewijXkRD8iGL6O2GgM="; 23 24 nativeBuildInputs = [ installShellFiles ]; 25
+6
pkgs/by-name/gu/guile-lib/package.nix
··· 3 stdenv, 4 fetchurl, 5 autoreconfHook, 6 guile, 7 pkg-config, 8 texinfo, ··· 32 substituteInPlace configure.ac \ 33 --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ 34 --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 35 ''; 36 37 makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
··· 3 stdenv, 4 fetchurl, 5 autoreconfHook, 6 + gettext, 7 guile, 8 pkg-config, 9 texinfo, ··· 33 substituteInPlace configure.ac \ 34 --replace 'SITEDIR="$datadir/guile-lib"' 'SITEDIR=$datadir/guile/site/$GUILE_EFFECTIVE_VERSION' \ 35 --replace 'SITECCACHEDIR="$libdir/guile-lib/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 'SITECCACHEDIR="$libdir/guile/$GUILE_EFFECTIVE_VERSION/site-ccache"' 36 + ''; 37 + 38 + # error: possibly undefined macro: AC_LIB_LINKFLAGS_FROM_LIBS 39 + preAutoreconf = '' 40 + cp ${gettext}/share/gettext/m4/lib-{ld,link,prefix}.m4 m4 41 ''; 42 43 makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
+3 -3
pkgs/by-name/he/hextazy/package.nix
··· 6 7 rustPlatform.buildRustPackage rec { 8 pname = "hextazy"; 9 - version = "0.8"; 10 11 src = fetchFromGitHub { 12 owner = "0xfalafel"; 13 repo = "hextazy"; 14 tag = version; 15 - hash = "sha256-6G0mD55BLMfqpgz1wtQBsAfGKlRcVEYJAPQJ3z8Yxnw="; 16 }; 17 18 useFetchCargoVendor = true; 19 - cargoHash = "sha256-1i0nngfqF4R/ILbNHrCW1NIEFTfQ5nRhjdKy7uebPi8="; 20 21 meta = { 22 description = "TUI hexeditor in Rust with colored bytes";
··· 6 7 rustPlatform.buildRustPackage rec { 8 pname = "hextazy"; 9 + version = "0.8.1"; 10 11 src = fetchFromGitHub { 12 owner = "0xfalafel"; 13 repo = "hextazy"; 14 tag = version; 15 + hash = "sha256-z7grcv7kfMvPqt9GI/NovGCWD1CZ38oiZ1bYDzZCbFg="; 16 }; 17 18 useFetchCargoVendor = true; 19 + cargoHash = "sha256-9JDqeLuQOs2AbrhQfn8pmnURXFyLf9/G9rEuvhedwr4="; 20 21 meta = { 22 description = "TUI hexeditor in Rust with colored bytes";
+4 -4
pkgs/by-name/hy/hyprland/info.json
··· 1 { 2 "branch": "main", 3 - "commit_hash": "9958d297641b5c84dcff93f9039d80a5ad37ab00", 4 - "commit_message": "version: bump to 0.49.0", 5 - "date": "2025-05-08", 6 - "tag": "v0.49.0" 7 }
··· 1 { 2 "branch": "main", 3 + "commit_hash": "c4a4c341568944bd4fb9cd503558b2de602c0213", 4 + "commit_message": "version: bump to 0.50.0", 5 + "date": "2025-07-16", 6 + "tag": "v0.50.0" 7 }
+6 -4
pkgs/by-name/hy/hyprland/package.nix
··· 41 xwayland, 42 debug ? false, 43 enableXWayland ? true, 44 - legacyRenderer ? false, 45 withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, 46 wrapRuntimeDeps ? true, 47 # deprecated flags 48 nvidiaPatches ? false, 49 hidpiXWayland ? false, 50 enableNvidiaPatches ? false, 51 }: 52 let 53 inherit (builtins) ··· 83 assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; 84 assert assertMsg (!hidpiXWayland) 85 "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; 86 87 customStdenv.mkDerivation (finalAttrs: { 88 pname = "hyprland" + optionalString debug "-debug"; 89 - version = "0.49.0"; 90 91 src = fetchFromGitHub { 92 owner = "hyprwm"; 93 repo = "hyprland"; 94 fetchSubmodules = true; 95 tag = "v${finalAttrs.version}"; 96 - hash = "sha256-3RVRQr+2WKBflZSsoLym9RwyqHWPk/J5WRtuJ0hgA+g="; 97 }; 98 99 postPatch = '' ··· 180 mesonFlags = concatLists [ 181 (mapAttrsToList mesonEnable { 182 "xwayland" = enableXWayland; 183 - "legacy_renderer" = legacyRenderer; 184 "systemd" = withSystemd; 185 "uwsm" = false; 186 "hyprpm" = false;
··· 41 xwayland, 42 debug ? false, 43 enableXWayland ? true, 44 withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, 45 wrapRuntimeDeps ? true, 46 # deprecated flags 47 nvidiaPatches ? false, 48 hidpiXWayland ? false, 49 enableNvidiaPatches ? false, 50 + legacyRenderer ? false, 51 }: 52 let 53 inherit (builtins) ··· 83 assert assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed."; 84 assert assertMsg (!hidpiXWayland) 85 "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; 86 + assert assertMsg ( 87 + !legacyRenderer 88 + ) "The option `legacyRenderer` has been removed. Legacy renderer is no longer supported."; 89 90 customStdenv.mkDerivation (finalAttrs: { 91 pname = "hyprland" + optionalString debug "-debug"; 92 + version = "0.50.0"; 93 94 src = fetchFromGitHub { 95 owner = "hyprwm"; 96 repo = "hyprland"; 97 fetchSubmodules = true; 98 tag = "v${finalAttrs.version}"; 99 + hash = "sha256-mXpj4jmQ4vwVPnsqqoQj87ZY2b1C4TFQlSOhYrjXeDI="; 100 }; 101 102 postPatch = '' ··· 183 mesonFlags = concatLists [ 184 (mapAttrsToList mesonEnable { 185 "xwayland" = enableXWayland; 186 "systemd" = withSystemd; 187 "uwsm" = false; 188 "hyprpm" = false;
+2 -2
pkgs/by-name/ll/llama-cpp/package.nix
··· 72 in 73 effectiveStdenv.mkDerivation (finalAttrs: { 74 pname = "llama-cpp"; 75 - version = "5836"; 76 77 src = fetchFromGitHub { 78 owner = "ggml-org"; 79 repo = "llama.cpp"; 80 tag = "b${finalAttrs.version}"; 81 - hash = "sha256-fo6wnwN3a4xZamwm68EVLNVfQkk+vSxgEoORQKLzdH8="; 82 leaveDotGit = true; 83 postFetch = '' 84 git -C "$out" rev-parse --short HEAD > $out/COMMIT
··· 72 in 73 effectiveStdenv.mkDerivation (finalAttrs: { 74 pname = "llama-cpp"; 75 + version = "5916"; 76 77 src = fetchFromGitHub { 78 owner = "ggml-org"; 79 repo = "llama.cpp"; 80 tag = "b${finalAttrs.version}"; 81 + hash = "sha256-qXvxFbU6n4RrPFKs3t+4GT46vUDZHLS5JM2tC6OemEo="; 82 leaveDotGit = true; 83 postFetch = '' 84 git -C "$out" rev-parse --short HEAD > $out/COMMIT
+3 -3
pkgs/by-name/mo/mongodb-cli/package.nix
··· 9 10 buildGoModule rec { 11 pname = "mongodb-cli"; 12 - version = "2.0.4"; 13 14 src = fetchFromGitHub { 15 owner = "mongodb"; 16 repo = "mongodb-cli"; 17 tag = "mongocli/v${version}"; 18 - hash = "sha256-GykGYbKvNmCOh83gctCNAIHYauFmFs3YTdjnysFD5RE="; 19 }; 20 21 - vendorHash = "sha256-wswI94EGJV6BHLu3z2ZgyNGOyczMUAOCtLFl+XI/LC0="; 22 23 subPackages = [ "cmd/mongocli" ]; 24
··· 9 10 buildGoModule rec { 11 pname = "mongodb-cli"; 12 + version = "2.0.5"; 13 14 src = fetchFromGitHub { 15 owner = "mongodb"; 16 repo = "mongodb-cli"; 17 tag = "mongocli/v${version}"; 18 + hash = "sha256-PL4GS+HpxAiaGgnW5jnOWCmxEWAwkAiquFXShFBeqYY="; 19 }; 20 21 + vendorHash = "sha256-khEkagnUqgfUBoOmeCxbkC2N/ER0oMkyg57AW3oB3i8="; 22 23 subPackages = [ "cmd/mongocli" ]; 24
+6
pkgs/by-name/pc/pcmanfm/package.nix
··· 14 withGtk3 ? true, 15 gtk2, 16 gtk3, 17 }: 18 19 let ··· 48 adwaita-icon-theme 49 ]; 50 51 configureFlags = optional withGtk3 "--with-gtk=3"; 52 53 meta = { 54 homepage = "https://blog.lxde.org/category/pcmanfm/";
··· 14 withGtk3 ? true, 15 gtk2, 16 gtk3, 17 + gettext, 18 + nix-update-script, 19 }: 20 21 let ··· 50 adwaita-icon-theme 51 ]; 52 53 + env.ACLOCAL = "aclocal -I ${gettext}/share/gettext/m4"; 54 + 55 configureFlags = optional withGtk3 "--with-gtk=3"; 56 + 57 + passthru.updateScript = nix-update-script { }; 58 59 meta = { 60 homepage = "https://blog.lxde.org/category/pcmanfm/";
+4 -4
pkgs/by-name/pk/pkgsite/package.nix
··· 7 8 buildGoModule { 9 pname = "pkgsite"; 10 - version = "0-unstable-2025-07-04"; 11 12 src = fetchFromGitHub { 13 owner = "golang"; 14 repo = "pkgsite"; 15 - rev = "eac0bf970406fce3244072d54d7843a6697b91be"; 16 - hash = "sha256-0JwcLEqVoWn8EWqzwOzULqkVaSTwmukpZ+YlwgKDd+0="; 17 }; 18 19 - vendorHash = "sha256-dZKm3dMI969HKPBrC95vVmY1cZmjy+NWq7xOzXsTE14="; 20 21 subPackages = [ "cmd/pkgsite" ]; 22
··· 7 8 buildGoModule { 9 pname = "pkgsite"; 10 + version = "0-unstable-2025-07-14"; 11 12 src = fetchFromGitHub { 13 owner = "golang"; 14 repo = "pkgsite"; 15 + rev = "01b046e81fe76030480fef8109ae0f3627dabcc0"; 16 + hash = "sha256-3hqLi50WJlDgRPdZ/WBydRxb+HLRnT7R79e9vOiqUgg="; 17 }; 18 19 + vendorHash = "sha256-sHpWI3oUuazFlWJhHB5uZ89z1GPbPfLoFQL12Jk3NP0="; 20 21 subPackages = [ "cmd/pkgsite" ]; 22
+6 -6
pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch
··· 1 - From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001 2 From: Morgan Helton <mhelton@gmail.com> 3 Date: Sun, 26 May 2024 12:17:01 -0500 4 Subject: [PATCH] envoy: allow specification of external binary ··· 8 1 file changed, 16 insertions(+), 4 deletions(-) 9 10 diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go 11 - index 8224f364..bb8b6506 100644 12 --- a/pkg/envoy/envoy.go 13 +++ b/pkg/envoy/envoy.go 14 @@ -8,9 +8,9 @@ import ( ··· 21 - "path" 22 "path/filepath" 23 "regexp" 24 - "strconv" 25 - @@ -35,8 +35,17 @@ import ( 26 27 const ( 28 configFileName = "envoy-config.yaml" ··· 40 // A Server is a pomerium proxy implemented via envoy. 41 type Server struct { 42 ServerOptions 43 - @@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil 44 log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy") 45 } 46 ··· 62 grpcPort: src.GetConfig().GRPCPort, 63 httpPort: src.GetConfig().HTTPPort, 64 -- 65 - 2.48.1 66
··· 1 + From 640d11fae5bcf1fa8c1a54facbe168a256cacc1b Mon Sep 17 00:00:00 2001 2 From: Morgan Helton <mhelton@gmail.com> 3 Date: Sun, 26 May 2024 12:17:01 -0500 4 Subject: [PATCH] envoy: allow specification of external binary ··· 8 1 file changed, 16 insertions(+), 4 deletions(-) 9 10 diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go 11 + index 85c725629..4a726a44b 100644 12 --- a/pkg/envoy/envoy.go 13 +++ b/pkg/envoy/envoy.go 14 @@ -8,9 +8,9 @@ import ( ··· 21 - "path" 22 "path/filepath" 23 "regexp" 24 + "runtime" 25 + @@ -36,8 +36,17 @@ import ( 26 27 const ( 28 configFileName = "envoy-config.yaml" ··· 40 // A Server is a pomerium proxy implemented via envoy. 41 type Server struct { 42 ServerOptions 43 + @@ -95,14 +104,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil 44 log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy") 45 } 46 ··· 62 grpcPort: src.GetConfig().GRPCPort, 63 httpPort: src.GetConfig().HTTPPort, 64 -- 65 + 2.49.0 66
+5 -5
pkgs/by-name/po/pomerium/package.nix
··· 1 { 2 - buildGo123Module, 3 fetchFromGitHub, 4 lib, 5 envoy, ··· 17 mapAttrsToList 18 ; 19 in 20 - buildGo123Module rec { 21 pname = "pomerium"; 22 - version = "0.29.4"; 23 src = fetchFromGitHub { 24 owner = "pomerium"; 25 repo = "pomerium"; 26 rev = "v${version}"; 27 - hash = "sha256-Oj/wC3rr7CAw2iB0H8yUvzv5VCEIo8kc5sZrxFX6NrI="; 28 }; 29 30 - vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q="; 31 32 ui = mkYarnPackage { 33 inherit version;
··· 1 { 2 + buildGoModule, 3 fetchFromGitHub, 4 lib, 5 envoy, ··· 17 mapAttrsToList 18 ; 19 in 20 + buildGoModule rec { 21 pname = "pomerium"; 22 + version = "0.30.3"; 23 src = fetchFromGitHub { 24 owner = "pomerium"; 25 repo = "pomerium"; 26 rev = "v${version}"; 27 + hash = "sha256-Rjv4GjyUs9sH+P5kYimxFnE2SBosEWbc7PbKIaVFxsI="; 28 }; 29 30 + vendorHash = "sha256-+SvKF54rkBY2wBZOYKuIV30BVqRqICuiPya+HApne1s="; 31 32 ui = mkYarnPackage { 33 inherit version;
+1 -1
pkgs/by-name/po/pomerium/yarn-hash
··· 1 - 1fqb1bcsg0k6xazr6v19jav11fl99mm3p9w53hl5xflb974m2lg0
··· 1 + 07zzvqfinl7qqmwh00izvfc0xch2rjr4s8b1ca9ay26krd4d4sap
+10 -3
pkgs/by-name/re/readstat/package.nix
··· 5 fetchpatch, 6 autoreconfHook, 7 pkg-config, 8 - libiconv, 9 }: 10 11 stdenv.mkDerivation rec { ··· 20 }; 21 22 patches = [ 23 (fetchpatch { 24 url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch"; 25 hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls="; ··· 36 nativeBuildInputs = [ 37 pkg-config 38 autoreconfHook 39 ]; 40 - 41 - buildInputs = [ libiconv ]; 42 43 enableParallelBuilding = true; 44
··· 5 fetchpatch, 6 autoreconfHook, 7 pkg-config, 8 + libtool, 9 }: 10 11 stdenv.mkDerivation rec { ··· 20 }; 21 22 patches = [ 23 + # Remove `gettext` requirement 24 + # https://github.com/WizardMac/ReadStat/issues/341 25 + (fetchpatch { 26 + url = "https://github.com/WizardMac/ReadStat/pull/342/commits/b5512b32d3b3c39e2f0c322df1339a3c61f73712.patch"; 27 + hash = "sha256-k1yeplrx3pFPl5qzLfsAaj+qunv1BqOZypA05xSolaQ="; 28 + }) 29 + 30 + # Add (void) to remove -Wstrict-prototypes warnings 31 (fetchpatch { 32 url = "https://github.com/WizardMac/ReadStat/commit/211c342a1cfe46fb7fb984730dd7a29ff4752f35.patch"; 33 hash = "sha256-nkaEgusylVu7NtzSzBklBuOnqO9qJPovf0qn9tTE6ls="; ··· 44 nativeBuildInputs = [ 45 pkg-config 46 autoreconfHook 47 + libtool 48 ]; 49 50 enableParallelBuilding = true; 51
+14
pkgs/by-name/sc/scanmem/gettext-0.25.patch
···
··· 1 + diff --git a/configure.ac b/configure.ac 2 + index f6ee0b9..378a3c9 100644 3 + --- a/configure.ac 4 + +++ b/configure.ac 5 + @@ -111,6 +111,9 @@ AS_IF([test "x$with_readline" != "xno"], [ 6 + ]) 7 + ]) 8 + 9 + +AM_GNU_GETTEXT_VERSION([0.25]) 10 + +AM_GNU_GETTEXT([external]) 11 + + 12 + GETTEXT_PACKAGE=GameConqueror 13 + AC_SUBST(GETTEXT_PACKAGE) 14 + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+4
pkgs/by-name/sc/scanmem/package.nix
··· 22 sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"; 23 }; 24 25 nativeBuildInputs = [ 26 autoreconfHook 27 gobject-introspection
··· 22 sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"; 23 }; 24 25 + patches = [ 26 + ./gettext-0.25.patch 27 + ]; 28 + 29 nativeBuildInputs = [ 30 autoreconfHook 31 gobject-introspection
+2 -2
pkgs/by-name/te/textcompare/package.nix
··· 16 17 stdenv.mkDerivation (finalAttrs: { 18 pname = "textcompare"; 19 - version = "0.1.4"; 20 21 src = fetchFromGitHub { 22 owner = "josephmawa"; 23 repo = "TextCompare"; 24 tag = "v${finalAttrs.version}"; 25 - hash = "sha256-NTHxFn67tVxVXnkwo3T4X25RH4LMwgp/ZopGKmif4rs="; 26 }; 27 28 strictDeps = true;
··· 16 17 stdenv.mkDerivation (finalAttrs: { 18 pname = "textcompare"; 19 + version = "0.1.5"; 20 21 src = fetchFromGitHub { 22 owner = "josephmawa"; 23 repo = "TextCompare"; 24 tag = "v${finalAttrs.version}"; 25 + hash = "sha256-PFQbaztaRErXHVLErVE/bBAsItNfp3DSbfx83omB04g="; 26 }; 27 28 strictDeps = true;
+3 -3
pkgs/data/fonts/gdouros/default.nix
··· 74 inherit pname version; 75 76 src = fetchzip { 77 - url = "https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; 78 stripRoot = false; 79 inherit hash; 80 }; ··· 91 92 meta = { 93 inherit description; 94 - # see https://web.archive.org/web/20240212172059/https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf 95 # quite draconian: non-commercial, no modifications, 96 # no redistribution, "a single instantiation and no 97 # network installation" 98 license = lib.licenses.unfree; 99 - homepage = "https://web.archive.org/web/20240212172059/https://dn-works.com/ufas/"; 100 }; 101 }; 102 in
··· 74 inherit pname version; 75 76 src = fetchzip { 77 + url = "https://web.archive.org/web/20221006174450/https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; 78 stripRoot = false; 79 inherit hash; 80 }; ··· 91 92 meta = { 93 inherit description; 94 + # see https://web.archive.org/web/20221006174450/https://dn-works.com/wp-content/uploads/2020/UFAS-Docs/License.pdf 95 # quite draconian: non-commercial, no modifications, 96 # no redistribution, "a single instantiation and no 97 # network installation" 98 license = lib.licenses.unfree; 99 + homepage = "https://web.archive.org/web/20221006174450/https://dn-works.com/ufas/"; 100 }; 101 }; 102 in
+2 -2
pkgs/development/python-modules/pypaperless/default.nix
··· 13 14 buildPythonPackage rec { 15 pname = "pypaperless"; 16 - version = "4.1.1"; 17 pyproject = true; 18 19 src = fetchFromGitHub { 20 owner = "tb1337"; 21 repo = "paperless-api"; 22 tag = "v${version}"; 23 - hash = "sha256-q2LQiO/9AGROczcKrfatO3P96Fvkdn0HqEDlUbRfhaE="; 24 }; 25 26 postPatch = ''
··· 13 14 buildPythonPackage rec { 15 pname = "pypaperless"; 16 + version = "5.0.0"; 17 pyproject = true; 18 19 src = fetchFromGitHub { 20 owner = "tb1337"; 21 repo = "paperless-api"; 22 tag = "v${version}"; 23 + hash = "sha256-ItaHtAhLrrrLrem6gW5oRUqYIJAdhBJH+aig2cWN1a4="; 24 }; 25 26 postPatch = ''
+7
pkgs/development/tools/analysis/hopper/default.nix
··· 7 gnustep-libobjc, 8 libbsd, 9 libffi_3_3, 10 ncurses6, 11 }: 12 ··· 59 --replace-fail "Exec=/opt/hopper-${finalAttrs.rev}/bin/Hopper" "Exec=hopper" 60 61 runHook postInstall 62 ''; 63 64 meta = {
··· 7 gnustep-libobjc, 8 libbsd, 9 libffi_3_3, 10 + libxml2, 11 ncurses6, 12 }: 13 ··· 60 --replace-fail "Exec=/opt/hopper-${finalAttrs.rev}/bin/Hopper" "Exec=hopper" 61 62 runHook postInstall 63 + ''; 64 + 65 + preFixup = '' 66 + # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108 67 + mkdir -p "$out/lib" 68 + ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/lib/libxml2.so.2" 69 ''; 70 71 meta = {
+1 -10
pkgs/top-level/all-packages.nix
··· 2214 }; 2215 2216 hyprland = callPackage ../by-name/hy/hyprland/package.nix { 2217 - stdenv = gcc14Stdenv; 2218 }; 2219 2220 hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix { ··· 7231 ); 7232 7233 flow = callPackage ../development/tools/analysis/flow { }; 7234 - 7235 - framac = callPackage ../by-name/fr/framac/package.nix { 7236 - ocamlPackages = ocaml-ng.ocamlPackages_5_2; 7237 - why3 = why3.override { 7238 - version = "1.7.2"; 7239 - coqPackages = coqPackages_8_18; 7240 - ocamlPackages = ocaml-ng.ocamlPackages_5_2; 7241 - }; 7242 - }; 7243 7244 fswatch = callPackage ../development/tools/misc/fswatch { 7245 autoreconfHook = buildPackages.autoreconfHook269;
··· 2214 }; 2215 2216 hyprland = callPackage ../by-name/hy/hyprland/package.nix { 2217 + stdenv = gcc15Stdenv; 2218 }; 2219 2220 hyprpolkitagent = callPackage ../by-name/hy/hyprpolkitagent/package.nix { ··· 7231 ); 7232 7233 flow = callPackage ../development/tools/analysis/flow { }; 7234 7235 fswatch = callPackage ../development/tools/misc/fswatch { 7236 autoreconfHook = buildPackages.autoreconfHook269;