Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
7ea63a1440
|
|
@ -82,7 +82,7 @@ rec {
|
|||
isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
|
||||
|
||||
isEfi = map (family: { cpu.family = family; })
|
||||
[ "x86" "arm" "aarch64" "riscv" ];
|
||||
[ "x86" "arm" "riscv" ];
|
||||
};
|
||||
|
||||
matchAnyAttrs = patterns:
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.8.9.36";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-xEFjyVly1VyDz9ALtVwxxrEs856joP+pe/mappyKrPU=";
|
||||
hash = "sha256-8Kr+DRbkTKvhetIIs4htOHlIXGLpoe+T+0yxjm/JcWk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig
|
||||
, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim
|
||||
# Qt 5 subpackages
|
||||
, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt
|
||||
, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -62,7 +62,6 @@ stdenv.mkDerivation rec {
|
|||
qtserialbus
|
||||
qtvirtualkeyboard
|
||||
qtmultimedia
|
||||
qtwebkit
|
||||
] ++ (with xorg; [
|
||||
libX11
|
||||
libXdamage
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkdt";
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs=";
|
||||
sha256 = "sha256-7b9mowMOdA4holdb5zUIqOGkB0/xB6AvJOfxA6IIfRc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-drawer";
|
||||
version = "0.3.7";
|
||||
version = "0.3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OcOF43SOlseb6UGTxLtGH0MRokZob0x+cczpdJc8Hq4=";
|
||||
sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs=";
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zine";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Z47BkBTKdzfjBJKjelJFu0tOU5bdjhLviDQ2fJQAlXE=";
|
||||
sha256 = "sha256-hkBQ9WaWJrDhGAt35yueINutc7sAMbgbr8Iw5h0Ey4I=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-sEIuilAjPZupSJojAu5DLtgToLCgMJKlJXWIAGcLeCQ=";
|
||||
cargoSha256 = "sha256-rY7WHgd5wyx7TUgJamzre8HjeI0BRtaM14V3doCkfVY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "kubectl-node-shell";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kvaps";
|
||||
repo = "kubectl-node-shell";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E=";
|
||||
sha256 = "sha256-TCd/VipsUT/h88CevqCLUUjN7wAJKYxxq63IpEF2P1Y=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -734,13 +734,13 @@
|
|||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=",
|
||||
"hash": "sha256-dfbmjl5gqffSE1sg5QEwzzbMXoL4bEKSFxU1bEdSMPs=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.10.0",
|
||||
"rev": "v1.11.0",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw="
|
||||
"vendorHash": "sha256-M2MlZNS4o1/GhQYiI72JVuhgfbNwa5ERFJjhB3nTpmE="
|
||||
},
|
||||
"mongodbatlas": {
|
||||
"hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=",
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "linphone-desktop";
|
||||
version = "4.4.10";
|
||||
version = "5.0.8";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -41,7 +41,7 @@ mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA=";
|
||||
hash = "sha256-e/0yGHtOHMgPhaF5xELodKS9/v/mbnT3ZpE12lXAocU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -54,7 +54,7 @@ mkDerivation rec {
|
|||
postPatch = ''
|
||||
echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake
|
||||
substituteInPlace linphone-app/src/app/AppController.cpp \
|
||||
--replace "LINPHONE_QT_GIT_VERSION" "\"${version}\""
|
||||
--replace "APPLICATION_SEMVER" "\"${version}\""
|
||||
'';
|
||||
|
||||
# TODO: After linphone-desktop and liblinphone split into separate packages,
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
gccStdenv.mkDerivation rec {
|
||||
pname = "programmer-calculator";
|
||||
version = "2.2";
|
||||
version = "3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alt-romes";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JQcYCYKdjdy8U2XMFzqTH9kAQ7CFv0r+sC1YfuAm7p8=";
|
||||
sha256 = "sha256-9mv8Jac6j3fKWLLCu1Bd/T5dbegUB8rRgsj9MaQhFDw=";
|
||||
};
|
||||
|
||||
buildInputs = [ ncurses ];
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@
|
|||
, pkg-config
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (self: {
|
||||
pname = "pekwm";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pekdon";
|
||||
repo = "pekwm";
|
||||
rev = "release-${version}";
|
||||
rev = "release-${self.version}";
|
||||
hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ=";
|
||||
};
|
||||
|
||||
|
|
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
libpng
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://www.pekwm.se/";
|
||||
description = "A lightweight window manager";
|
||||
longDescription = ''
|
||||
|
|
@ -65,8 +65,9 @@ stdenv.mkDerivation rec {
|
|||
they should when starting applications.
|
||||
- Chainable Keygrabber, usability for everyone.
|
||||
'';
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${self.version}/NEWS.md";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "marathi-cursive";
|
||||
version = "2.0";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz";
|
||||
hash = "sha256-JE9T3UMSYn/JfEWuWHikDJIlt4nZl6GzY98v3vG6di4=";
|
||||
hash = "sha256-C/z8ALV9bht0SaYqACO5ulSVCk1d6wBwvpVC4ZLgtek=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bctoolbox";
|
||||
version = "5.2.0";
|
||||
version = "5.2.16";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-HbKo5E1K+W5tPqRbcG4+ymUXv87iqc094pTeng94Aao=";
|
||||
hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM=";
|
||||
};
|
||||
|
||||
# Do not build static libraries
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bzrtp";
|
||||
version = "5.1.12";
|
||||
version = "5.2.16";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-GsHVuNXzLkbKUaHtnyXAr7bR9Emc55zcmKt3RGjCMtA=";
|
||||
hash = "sha256-nrnGmJxAeobejS6zdn5Z/kOFOxyepZcxW/G4nXAt2DY=";
|
||||
};
|
||||
|
||||
buildInputs = [ bctoolbox sqlite ];
|
||||
|
|
|
|||
|
|
@ -15,11 +15,12 @@
|
|||
, lib
|
||||
, stdenv
|
||||
, xercesc
|
||||
, zxing-cpp
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblinphone";
|
||||
version = "5.1.22";
|
||||
version = "5.2.17";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -27,10 +28,14 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY=";
|
||||
hash = "sha256-zxp+jcClfKm+VsylRtydF2rlDCkO+sa9vw8GpwAfKHM=";
|
||||
};
|
||||
|
||||
patches = [ ./use-normal-jsoncpp.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace "jsoncpp_object" "jsoncpp" \
|
||||
--replace "jsoncpp_static" "jsoncpp"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_STATIC=NO" # Do not build static libraries
|
||||
|
|
@ -52,6 +57,7 @@ stdenv.mkDerivation rec {
|
|||
(python3.withPackages (ps: [ ps.pystache ps.six ]))
|
||||
sqlite
|
||||
xercesc
|
||||
zxing-cpp
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001
|
||||
From: Lorenz Brun <lorenz@brun.one>
|
||||
Date: Fri, 18 Mar 2022 17:36:22 +0100
|
||||
Subject: [PATCH] Use normal jsoncpp
|
||||
|
||||
---
|
||||
src/CMakeLists.txt | 6 +++---
|
||||
tester/CMakeLists.txt | 2 +-
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 5cd87fe9a..822b2151e 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
|
||||
if (XCODE)
|
||||
list(APPEND LINK_LIBS jsoncpp_static)
|
||||
else()
|
||||
- list(APPEND LINK_LIBS jsoncpp_object)
|
||||
+ list(APPEND LINK_LIBS jsoncpp)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -592,7 +592,7 @@ if(ENABLE_STATIC)
|
||||
if (XCODE)
|
||||
target_link_libraries(linphone PRIVATE jsoncpp_static)
|
||||
else()
|
||||
- target_link_libraries(linphone PRIVATE jsoncpp_object)
|
||||
+ target_link_libraries(linphone PRIVATE jsoncpp)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -646,7 +646,7 @@ if(ENABLE_SHARED)
|
||||
if (XCODE)
|
||||
target_link_libraries(linphone PRIVATE jsoncpp_static)
|
||||
else()
|
||||
- target_link_libraries(linphone PRIVATE jsoncpp_object)
|
||||
+ target_link_libraries(linphone PRIVATE jsoncpp)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
|
||||
index b97042678..b4c5a5794 100644
|
||||
--- a/tester/CMakeLists.txt
|
||||
+++ b/tester/CMakeLists.txt
|
||||
@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI)
|
||||
if (XCODE)
|
||||
list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static)
|
||||
else()
|
||||
- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object)
|
||||
+ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediastreamer2";
|
||||
version = "5.1.20";
|
||||
version = "5.2.16";
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU=";
|
||||
hash = "sha256-K4EBZC3zuLKF9Qw4i24f0hYKlOgRM7MR4Ck2ZoTYi6I=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ortp";
|
||||
version = "5.1.55";
|
||||
version = "5.2.16";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
|
|
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
group = "BC";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw=";
|
||||
hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4=";
|
||||
};
|
||||
|
||||
# Do not build static libraries
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sofia-sip";
|
||||
version = "1.13.10";
|
||||
version = "1.13.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "freeswitch";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UVyjeIIS0WwnY3GoZLIYTgf7R+C8SCuykDozaxCpog0=";
|
||||
sha256 = "sha256-2K5Lt2zk5MXKD9zIQ2pBt2IRx/H1Zg/S70dsrpI2mTM=";
|
||||
};
|
||||
|
||||
buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration;
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unixODBC";
|
||||
version = "2.3.9";
|
||||
version = "2.3.11";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
"ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz"
|
||||
"http://www.unixodbc.org/${pname}-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc=";
|
||||
sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w=";
|
||||
};
|
||||
|
||||
configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ];
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import ./generic.nix {
|
||||
majorVersion = "9.2";
|
||||
minorVersion = "2";
|
||||
sourceSha256 = "sha256-HFsKK+cfrJb/SDGvaeNQ96DqMWiYH3kMAAcJ3PkSEHU=";
|
||||
minorVersion = "5";
|
||||
sourceSha256 = "sha256-Eo1gG6qYDpjuA0IHl0sz+zjSyYq5z0pXVu/bCe1sCUk=";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -252,8 +252,23 @@ with some rules (internal to resholve) for locating sub-executions in
|
|||
some of the more common commands.
|
||||
|
||||
- "execer" lore identifies whether an executable can, cannot,
|
||||
or might execute its arguments. Every "can" or "might" verdict requires
|
||||
either built-in rules for finding the executable, or human triage.
|
||||
or might execute its arguments. Every "can" or "might" verdict requires:
|
||||
- an update to the matching rules in [binlore](https://github.com/abathur/binlore)
|
||||
if there's absolutely no exec in the executable and binlore just lacks
|
||||
rules for understanding this
|
||||
- an override in [binlore](https://github.com/abathur/binlore) if there is
|
||||
exec but it isn't actually under user control
|
||||
- a parser in [resholve](https://github.com/abathur/resholve) capable of
|
||||
isolating the exec'd words if the command does have exec under user
|
||||
control
|
||||
- overriding the execer lore for the executable if manual triage indicates
|
||||
that all of the invocations in the current package don't include any
|
||||
commands that the executable would exec
|
||||
- if manual triage turns up any commands that would be exec'd, use some
|
||||
non-resholve tool to patch/substitute/replace them before or after you
|
||||
run resholve on them (if before, you may need to also add keep directives
|
||||
for these absolute paths)
|
||||
|
||||
- "wrapper" lore maps shell exec wrappers to the programs they exec so
|
||||
that resholve can substitute an executable's verdict for its wrapper's.
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@
|
|||
, # py-yajl deps
|
||||
git
|
||||
, # oil deps
|
||||
readline
|
||||
, cmark
|
||||
cmark
|
||||
, file
|
||||
, glibcLocales
|
||||
, six
|
||||
|
|
@ -36,12 +35,12 @@ rec {
|
|||
|
||||
py-yajl = python27.pkgs.buildPythonPackage rec {
|
||||
pname = "oil-pyyajl-unstable";
|
||||
version = "2019-12-05";
|
||||
version = "2022-09-01";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oilshell";
|
||||
repo = "py-yajl";
|
||||
rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df";
|
||||
sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh";
|
||||
rev = "72686b0e2e9d13d3ce5fefe47ecd607c540c90a3";
|
||||
hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
# just for submodule IIRC
|
||||
|
|
@ -60,9 +59,9 @@ rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "oilshell";
|
||||
repo = "oil";
|
||||
# rev == present HEAD of release/0.8.12
|
||||
rev = "799c0703d1da86cb80d1f5b163edf9369ad77cf1";
|
||||
hash = "sha256-QNSISr719ycZ1Z0quxHWzCb3IvHGj9TpogaYz20hDM4=";
|
||||
# rev == present HEAD of release/0.14.0
|
||||
rev = "3d0427e222f7e42ae7be90c706d7fde555efca2e";
|
||||
hash = "sha256-XMoNkBEEmD6AwNSu1uSh3OcWLfy4/ADtRckn/Pj2cP4=";
|
||||
|
||||
/*
|
||||
It's not critical to drop most of these; the primary target is
|
||||
|
|
@ -73,16 +72,16 @@ rec {
|
|||
hash on rev updates. Command will fail w/o and not print hash.
|
||||
*/
|
||||
postFetch = ''
|
||||
rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp
|
||||
rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo,devtools}
|
||||
'';
|
||||
};
|
||||
|
||||
# patch to support a python package, pass tests on macOS, etc.
|
||||
# patch to support a python package, pass tests on macOS, drop deps, etc.
|
||||
patchSrc = fetchFromGitHub {
|
||||
owner = "abathur";
|
||||
repo = "nix-py-dev-oil";
|
||||
rev = "v0.8.12.2";
|
||||
hash = "sha256-+dVxzPKMGNKFE+7Ggzx9iWjjvwW2Ow3UqmjjUud9Mqo=";
|
||||
rev = "v0.14.0.0";
|
||||
hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8=";
|
||||
};
|
||||
patches = [
|
||||
"${patchSrc}/0001-add_setup_py.patch"
|
||||
|
|
@ -91,13 +90,18 @@ rec {
|
|||
"${patchSrc}/0006-disable_failing_libc_tests.patch"
|
||||
"${patchSrc}/0007-namespace_via_init.patch"
|
||||
"${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch"
|
||||
"${patchSrc}/0010-disable-line-input.patch"
|
||||
"${patchSrc}/0011-disable-fanos.patch"
|
||||
"${patchSrc}/0012-disable-doc-cmark.patch"
|
||||
];
|
||||
|
||||
buildInputs = [ readline cmark py-yajl ];
|
||||
configureFlags = [
|
||||
"--without-readline"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ re2c file makeWrapper ];
|
||||
|
||||
propagatedBuildInputs = [ six typing ];
|
||||
propagatedBuildInputs = [ six typing py-yajl ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
|
@ -106,7 +110,12 @@ rec {
|
|||
'';
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs asdl build core doctools frontend native oil_lang
|
||||
patchShebangs asdl build core doctools frontend pyext oil_lang
|
||||
substituteInPlace pyext/fastlex.c --replace '_gen/frontend' '../_gen/frontend'
|
||||
substituteInPlace core/main_loop.py --replace 'import fanos' '# import fanos'
|
||||
rm cpp/stdlib.h # keep modules from finding the wrong stdlib?
|
||||
# work around hard parse failure documented in oilshell/oil#1468
|
||||
substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False'
|
||||
'';
|
||||
|
||||
/*
|
||||
|
|
@ -120,8 +129,17 @@ rec {
|
|||
# See earlier note on glibcLocales TODO: verify needed?
|
||||
LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
|
||||
|
||||
# not exhaustive; just a spot-check for now
|
||||
pythonImportsCheck = [ "oil" "oil._devbuild" ];
|
||||
# not exhaustive; sample what resholve uses as a sanity check
|
||||
pythonImportsCheck = [
|
||||
"oil"
|
||||
"oil.asdl"
|
||||
"oil.core"
|
||||
"oil.frontend"
|
||||
"oil._devbuild"
|
||||
"oil._devbuild.gen.id_kind_asdl"
|
||||
"oil._devbuild.gen.syntax_asdl"
|
||||
"oil.tools.osh2oil"
|
||||
];
|
||||
|
||||
meta = {
|
||||
license = with lib.licenses; [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
}:
|
||||
|
||||
rec {
|
||||
version = "0.8.5";
|
||||
version = "0.9.0";
|
||||
rSrc =
|
||||
# local build -> `make ci`; `make clean` to restore
|
||||
# return to remote source
|
||||
|
|
@ -14,6 +14,6 @@ rec {
|
|||
owner = "abathur";
|
||||
repo = "resholve";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DX1xe3YC0PlhwbjsvbmUzNjrwhxFpbZW87WWbKcD0us=";
|
||||
hash = "sha256-FRdCeeC2c3bMEXekEyilgW0PwFfUWGstZ5mXdmRPM5w=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "awscrt";
|
||||
version = "0.16.6";
|
||||
version = "0.16.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2q8VSYPeRVRWsfG9f95lxTE1qohZen6FxghiH9Mxnjg=";
|
||||
hash = "sha256-26JjUlFLyNtm93/UkvEO+eV22ZHI1gxWecf2cuBifgE=";
|
||||
};
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "devpi-common";
|
||||
version = "3.7.1";
|
||||
version = "3.7.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Y4LSWo6sbHn239qSdQjwfZO4cyNyoGFQVVGvZbRgYfQ=";
|
||||
sha256 = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ffmpeg-progress-yield";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JLwvJcYcSe5Z7In34pQqHptd8TCrXJeJ6zPiGGv4T14=";
|
||||
hash = "sha256-rt+Qg1H9t5PC4cyis9xuyf8myfxWLkTq3aD83+O4qmA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ colorama tqdm ];
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mat2";
|
||||
version = "0.13.1";
|
||||
version = "0.13.2";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
owner = "jvoisin";
|
||||
repo = "mat2";
|
||||
rev = version;
|
||||
hash = "sha256-/HcWVXguZf9cCGY0xlC7uMnLkSAqZ0DIAC6JUw2KKDs=";
|
||||
hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "moku";
|
||||
version = "2.5.1";
|
||||
version = "2.6.0";
|
||||
|
||||
/*
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
*/
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-oFRwJ6i4wfjA3E2QMqE4ybutT7OZiFZ3LYXoplY3D/I=";
|
||||
hash = "sha256-tG54V26H7viu5DPs3EWTg7ouCsdC3EXoeb8iexO6YBw=";
|
||||
};
|
||||
/*
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nocasedict";
|
||||
version = "1.0.4";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-fBEdpM79JEQzy2M3ev8IGkD4S92unm83bGfwhsD4Bto=";
|
||||
sha256 = "sha256-rFUd5pK+aupbQ6w/LDN4DflAATrG3QcY+1Usi1YLpmE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyhiveapi";
|
||||
version = "0.5.14";
|
||||
version = "0.5.15";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "Pyhass";
|
||||
repo = "Pyhiveapi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YBcVoffcM3nkVmuPKE6WR/1TqAiz6ePzCxcrntqCQkY=";
|
||||
hash = "sha256-tR2PCR1qGn4KnqAjEpcRTcVlMEpKCwn5RAm99AXBSnk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynamodb";
|
||||
version = "5.3.4";
|
||||
version = "5.3.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "pynamodb";
|
||||
repo = "PynamoDB";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-qg/aFK7rt2a/ZcLm+VSlq8UYBh6zS0/VVLqRAN7kLus=";
|
||||
hash = "sha256-cxWPnq+xGDaJ1rj/K25ELATFAW+/eteilrnqrCftW0Q=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
38
pkgs/development/python-modules/safe-pysha3/default.nix
Normal file
38
pkgs/development/python-modules/safe-pysha3/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "safe-pysha3";
|
||||
version = "1.0.3";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Kd+lb9t5ney50BvdfbwPKAb0Ro0sKW+DtuN9hlMZF8I=";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${python.interpreter} tests.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"sha3"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/5afe/pysha3/releases/tag/v${version}";
|
||||
description = "SHA-3 (Keccak) for Python 3.9 - 3.11";
|
||||
homepage = "https://github.com/5afe/pysha3";
|
||||
license = lib.licenses.psfl;
|
||||
maintainers = with lib.maintainers; [ wegank ];
|
||||
};
|
||||
}
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yamlfix";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "lyz-code";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TdW2vVj5wZw8xANSRY8ke1ECw8UTDwRjJDD1g+p9DV4=";
|
||||
hash = "sha256-OXo9PkvKn+XPxfXUObwps62lwNo6lE4Ot5L0lZPIYPw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
buildGoModule rec {
|
||||
pname = "run";
|
||||
version = "0.9.1";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TekWizely";
|
||||
repo = "run";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ClSB+v153Tj1cKLSmT9Z0IEyc+OABPeG519PzT03pX0=";
|
||||
sha256 = "sha256-EIzIkew1JXPeUN3guLEjAwR0kBDrMkQtSUiBJd+Ww7E=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-4n8RRnDNu1Khv3V5eUB/eaFFJGVD/GdqMOywksc2LPw=";
|
||||
vendorHash = "sha256-BAyhuE9hGGDfDGmXQ7dseUvHlK5vC87uLT78lHSvLeg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-embed";
|
||||
version = "0.14.2";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rSixQ9ZGO5iqreW+WKdHx0vlwacJzJ2L7qPWVjT3Xls=";
|
||||
sha256 = "sha256-YAeE3pDw5xqSn4rAv3lxJtKQHki1bf97CJHBEK8JoiA=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-O/vMXWyNUdMyH2Pb6DK2AbqOMagmsMNgp5OyIyAiiqg=";
|
||||
cargoSha256 = "sha256-p6d8vdiAVkufTQv3FliKCBgF5ZXM24UnG96EzlpyfZE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-flash";
|
||||
version = "0.14.2";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7sWfMFFjFUdnoMV1O8mzyHAAS8Pvvf1xsY717ZeD7i8=";
|
||||
sha256 = "sha256-Zwb9jUZwkvuBzvACMwKwpAHEMkjLVDkXfDLo4ntG3+k=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-yae+hh2jrQn6ryn/WPFZmiZrq7d+osegD/MyBk8OOLg=";
|
||||
cargoSha256 = "sha256-giGSTMtGTIw4ZZglHqbW2sGKO/D/3TVQR5olTgitBjE=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-modules";
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "regexident";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-5j7zTAFUkevhSpiOn8KNG5+N7M9M1+c6hAKpDwPXdBQ=";
|
||||
sha256 = "sha256-G9ResHOBEqnKsMXVbr8q1rvywFI8LJcb8gR7hMTI0p4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-jCbs/y0L9YP9VDEtofeqWXbUlsBpVRMbjIYtPRlmQVY=";
|
||||
cargoSha256 = "sha256-p6mq+P9ntlhjMPHpcwXV9XBlAX6R63Iqastl9ZHI8Vs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.CoreServices
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "probe-rs-cli";
|
||||
version = "0.14.2";
|
||||
version = "0.16.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-CrBgj0M3slhPrAYc2+I80ZfUC/CJzcmFwLc9yX2SSR4=";
|
||||
sha256 = "sha256-YNOD0hDDQ6M496m9lps28UX41pMO1r/CE30rcS53h48=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-nHjVldLsi9Xr6pPOeLpb6anvno2244g/LNIv7DnbSI4=";
|
||||
cargoSha256 = "sha256-/1bnDtfNxnOI4Inmnd+r2epT236ghQsiNuoAuROEfPM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ];
|
||||
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pax-utils";
|
||||
version = "1.3.6";
|
||||
version = "1.3.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-pNU5isAZh9cPgaWZSSvWmSqukKV3TFGGntOKN6y1zIo=";
|
||||
sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "miniflux";
|
||||
version = "2.0.41";
|
||||
version = "2.0.42";
|
||||
|
||||
in buildGoModule {
|
||||
inherit pname version;
|
||||
|
|
@ -11,10 +11,10 @@ in buildGoModule {
|
|||
owner = pname;
|
||||
repo = "v2";
|
||||
rev = version;
|
||||
sha256 = "sha256-NhxzpNtRzLE9bVWIGSHwnok7RjqRp8Uan9uCvdigAyk=";
|
||||
sha256 = "sha256-2ywaQubE/DZCTIX6a3vh1VH+/lfoe9gRzkqih8ULU8Q=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-906gMXI6zEIIcXvT/ZqAM+5F0GVHbipUtdrPO6+32KQ=";
|
||||
vendorSha256 = "sha256-KtYFjNqUIYgAwIkEhQwg5OdjIluyENeZ6Qo5TGKzA/s=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tt-rss-theme-feedly";
|
||||
version = "2.10.0";
|
||||
version = "3.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "levito";
|
||||
repo = "tt-rss-feedly-theme";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-a8IZZbTlVU8Cu1F/HwEnsUW3eRqaTnKuJ166WJIw9/A=";
|
||||
sha256 = "sha256-sHKht4EXKIibk+McMR+fKv7eZFJsGgZWhfxlLssA/Sw=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "shiori";
|
||||
version = "1.5.3";
|
||||
version = "1.5.4";
|
||||
|
||||
vendorSha256 = "sha256-vyBb8jNpXgpiktbn2lphL2wAeKmvjJLxV8ZrHoUSNYY=";
|
||||
vendorHash = "sha256-8aiaG2ry/XXsosbrLBmwnjbwIhbKMdM6WHae07MG7WI=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ buildGoModule rec {
|
|||
owner = "go-shiori";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-razBb/flqwyFG4SPWhSapDO1sB5DYzyjYGx8ABFg/I8=";
|
||||
sha256 = "sha256-QZTYhRz65VLs3Ytv0k8ptfeQ/36M2VBXFaD9zhQXDh8=";
|
||||
};
|
||||
|
||||
passthru.tests = {
|
||||
|
|
|
|||
|
|
@ -5,15 +5,15 @@
|
|||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2023-01-17";
|
||||
version = "2023-01-26";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "61dd3682e69aa990a8a3589c5c61ea2e1edf8312";
|
||||
rev = "e55e3f0f56ab4df21eb33e19569c295e7e5e71a4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "5ixM/cQdhr/ycXoL2G1Mvc77zxN3Di75W2Hhst8HvZ0=";
|
||||
sha256 = "gN5jjhbRxSBJiXs1DsUeMHCCsv9qSOxC4guHmjJdW7U=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.19.3";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-TDA1T36iY3xRFX0mBYazKeyzoDD7RPWRxQfUF7Rv5vA=";
|
||||
sha256 = "sha256-FgVXl986PPaX/6TX7MaXPd+NJ3M94fNGa1hFWUDRP8w=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-rBZ9cYk5Gzs8hy8fRgO8I0zaBncl8CwQoX5I0qzHBYE=";
|
||||
cargoHash = "sha256-uWKSO2odvBeFUcZPGcsEki0PdNVtbVv5g3Dnkxgw2Io=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,18 @@
|
|||
{ fetchFromGitHub
|
||||
, lib
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "barman";
|
||||
version = "3.3.0";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EnterpriseDB";
|
||||
repo = pname;
|
||||
rev = "refs/tags/release/${version}";
|
||||
sha256 = "sha256-4mbu3Z48jZQqRft4vkz/x4a7kAOiTrQfnyQpXl3MJn0=";
|
||||
hash = "sha256-K5y5C+K/fMhgOcSsCMaIgY6ce9UUPszoyumsfNHKjBo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -45,6 +46,7 @@ python3Packages.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://www.pgbarman.org/";
|
||||
description = "Backup and Recovery Manager for PostgreSQL";
|
||||
changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS";
|
||||
maintainers = with maintainers; [ freezeboy ];
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.unix;
|
||||
|
|
|
|||
|
|
@ -19,13 +19,13 @@
|
|||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "osm2pgsql";
|
||||
version = "1.7.2";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openstreetmap";
|
||||
repo = "osm2pgsql";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g=";
|
||||
hash = "sha256-v+/pT8HnLoeeYe33v4xUoR5YWD/jHgEG/Q11Trw9X2s=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ]
|
||||
buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ]
|
||||
++ lib.optional withLuaJIT luajit
|
||||
++ lib.optional (!withLuaJIT) lua;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DEXTERNAL_LIBOSMIUM=ON"
|
||||
"-DEXTERNAL_PROTOZERO=ON"
|
||||
"-DEXTERNAL_RAPIDJSON=ON"
|
||||
"-DEXTERNAL_FMT=ON"
|
||||
] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON";
|
||||
|
||||
|
|
|
|||
|
|
@ -14,13 +14,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mu";
|
||||
version = "1.8.13";
|
||||
version = "1.8.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "djcb";
|
||||
repo = "mu";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uXrJOBF3X8UF1ktTfAoYgzc0QBLvyzzGQVJVfs8tjng=";
|
||||
hash = "sha256-m6if0Br9WRPR8POwOM0Iwido3UR/V0BlkuaLcWsf/c0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -217,6 +217,8 @@ mapAliases ({
|
|||
clang11Stdenv = lowPrio llvmPackages_11.stdenv;
|
||||
clang12Stdenv = lowPrio llvmPackages_12.stdenv;
|
||||
clang13Stdenv = lowPrio llvmPackages_13.stdenv;
|
||||
clang14Stdenv = lowPrio llvmPackages_14.stdenv;
|
||||
clang15Stdenv = lowPrio llvmPackages_15.stdenv;
|
||||
|
||||
clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22
|
||||
clasp = clingo; # added 2022-12-22
|
||||
|
|
|
|||
|
|
@ -10194,6 +10194,8 @@ self: super: with self; {
|
|||
|
||||
safe = callPackage ../development/python-modules/safe { };
|
||||
|
||||
safe-pysha3 = callPackage ../development/python-modules/safe-pysha3 { };
|
||||
|
||||
safeio = callPackage ../development/python-modules/safeio { };
|
||||
|
||||
safety = callPackage ../development/python-modules/safety { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue