gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

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