diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/resvg/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/graphics/zbar/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/misc/online-judge-template-generator/default.nix | 51 | ||||
| -rw-r--r-- | pkgs/tools/networking/rathole/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/tools/package-management/micromamba/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/tcb/default.nix | 51 | ||||
| -rw-r--r-- | pkgs/tools/security/tcb/fix-makefiles.patch | 52 |
7 files changed, 179 insertions, 14 deletions
diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index b9085a4dda1c3..f48fcd4a451fe 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rl3bGXCwVmJdBPANWYJEIuGlKUQTqWy8tutyx0zzG+U="; + sha256 = "sha256-OEknK4uLINui6U+mz0P9K36pEzfx+TevGvLqM0RXkSM="; }; - cargoSha256 = "sha256-iluhNT4qsg5flLRdH88xuUSt22+e5cgkTYXVXNI1L3I="; + cargoSha256 = "sha256-L3Km+VIoIun1wjKyJ3dscK5PSfQVR7qyjU6y1j9quSg="; meta = with lib; { description = "An SVG rendering library"; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index d3c4003741e3e..4e850e4fe6c70 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , imagemagickBig , pkg-config +, withXorg ? true , libX11 , libv4l , qtbase @@ -41,16 +42,18 @@ stdenv.mkDerivation rec { xmlto autoreconfHook docbook_xsl - wrapQtAppsHook + ] ++ lib.optionals enableVideo [ wrapGAppsHook + wrapQtAppsHook ]; buildInputs = [ imagemagickBig - libX11 libintl ] ++ lib.optionals enableDbus [ dbus + ] ++ lib.optionals withXorg [ + libX11 ] ++ lib.optionals enableVideo [ libv4l gtk3 diff --git a/pkgs/tools/misc/online-judge-template-generator/default.nix b/pkgs/tools/misc/online-judge-template-generator/default.nix new file mode 100644 index 0000000000000..cf1ab7b707884 --- /dev/null +++ b/pkgs/tools/misc/online-judge-template-generator/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, appdirs +, beautifulsoup4 +, colorlog +, fetchFromGitHub +, Mako +, online-judge-api-client +, online-judge-tools +, ply +, pyyaml +, requests +, setuptools +, toml +}: + +buildPythonApplication rec { + pname = "online-judge-template-generator"; + version = "4.8.1"; + + src = fetchFromGitHub { + owner = "online-judge-tools"; + repo = "template-generator"; + rev = "v${version}"; + sha256 = "sha256-cS1ED1a92fEFqy6ht8UFjxocWIm35IA/VuaPSLsdlqg="; + }; + + propagatedBuildInputs = [ + appdirs + beautifulsoup4 + colorlog + Mako + online-judge-api-client + online-judge-tools + ply + pyyaml + requests + setuptools + toml + ]; + + # Needs internet to run tests + doCheck = false; + + meta = with lib; { + description = "Analyze problems of competitive programming and automatically generate boilerplate"; + homepage = "https://github.com/online-judge-tools/template-generator"; + license = licenses.mit; + maintainers = with maintainers; [ sei40kr ]; + }; +} diff --git a/pkgs/tools/networking/rathole/default.nix b/pkgs/tools/networking/rathole/default.nix index 206849bd41f7d..bed5f81b55dfb 100644 --- a/pkgs/tools/networking/rathole/default.nix +++ b/pkgs/tools/networking/rathole/default.nix @@ -6,28 +6,36 @@ , openssl , CoreServices }: + rustPlatform.buildRustPackage rec { pname = "rathole"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "rapiz1"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-mebrhBmRPN+AydxKhe2g7ehe9r9rDqt5dXO8rRUIlJg="; + rev = "refs/tags/v${version}"; + hash = "sha256-YauQg+P4Y8oO8Kn6FB3NxBI7PHoo/bjS38bM1lFeCH0="; }; - cargoSha256 = "sha256-uECM5j/xgrzPvrarDl6wxaD3Cn3Ut3aMM9OBvsc7ZqE="; + cargoHash = "sha256-OcPmHqjW79SKMET6J5HIwmR5vESh+PJcQjSMsqmnIb8="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A lightweight and high-performance reverse proxy for NAT traversal, written in Rust"; + description = "Reverse proxy for NAT traversal"; homepage = "https://github.com/rapiz1/rathole"; + changelog = "https://github.com/rapiz1/rathole/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; }; diff --git a/pkgs/tools/package-management/micromamba/default.nix b/pkgs/tools/package-management/micromamba/default.nix index 305e996e0d713..1df83b44ca62d 100644 --- a/pkgs/tools/package-management/micromamba/default.nix +++ b/pkgs/tools/package-management/micromamba/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.25.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - sha256 = "sha256-aTScTM1jX1WIrAVkAvp37fMa+05teLJnVdyIwtYq7mY="; + sha256 = "sha256-t1DfLwBGW6MfazuFludn6/fdYWFaMnkhXva6bvus694="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/tools/security/tcb/default.nix new file mode 100644 index 0000000000000..63b252be95214 --- /dev/null +++ b/pkgs/tools/security/tcb/default.nix @@ -0,0 +1,51 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config +, linux-pam, libxcrypt +}: + +stdenv.mkDerivation rec { + pname = "tcb"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "openwall"; + repo = pname; + rev = "070cf4aa784de13c52788ac22ff611d7cbca0854"; + sha256 = "sha256-Sp5u7iTEZZnAqKQXoPO8eWpSkZeBzQqZI82wRQmgU9A="; + }; + + outputs = [ "out" "bin" "dev" "man" ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ linux-pam libxcrypt ]; + + patches = [ ./fix-makefiles.patch ]; + + postPatch = '' + substituteInPlace Make.defs \ + --replace "PREFIX = /usr" "PREFIX = $out" \ + --replace "SBINDIR = /sbin" "SBINDIR = $bin/bin" \ + --replace "INCLUDEDIR = \$(PREFIX)/include" "INCLUDEDIR = $dev/include" + ''; + + meta = with lib; { + description = "Alternative password shadowing scheme"; + longDescription = '' + The tcb package contains core components of our tcb suite implementing the alternative + password shadowing scheme on Openwall GNU Linux (Owl). It is being made available + separately from Owl primarily for use by other distributions. + + The package consists of three components: pam_tcb, libnss_tcb, and libtcb. + + pam_tcb is a PAM module which supersedes pam_unix. It also implements the tcb password + shadowing scheme. The tcb scheme allows many core system utilities (passwd(1) being + the primary example) to operate with little privilege. libnss_tcb is the accompanying + NSS module. libtcb contains code shared by the PAM and NSS modules and is also used + by user management tools on Owl due to our shadow suite patches. + ''; + homepage = "https://www.openwall.com/tcb/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/tools/security/tcb/fix-makefiles.patch b/pkgs/tools/security/tcb/fix-makefiles.patch new file mode 100644 index 0000000000000..9ea82605d5572 --- /dev/null +++ b/pkgs/tools/security/tcb/fix-makefiles.patch @@ -0,0 +1,52 @@ +diff --git a/Make.defs b/Make.defs +index a961f7d..9e8d59b 100644 +--- a/Make.defs ++++ b/Make.defs +@@ -19,7 +19,7 @@ LDFLAGS += $(DBGFLAG) -L../libs + + PREFIX = /usr + SBINDIR = /sbin +-SLIBDIR = /lib ++SLIBDIR = $(PREFIX)/lib + INCLUDEDIR = $(PREFIX)/include + LIBDIR = $(PREFIX)/lib + LIBEXECDIR = $(PREFIX)/libexec +diff --git a/libs/Makefile b/libs/Makefile +index 0083b13..27238f6 100644 +--- a/libs/Makefile ++++ b/libs/Makefile +@@ -7,7 +7,7 @@ LIBTCB_A = libtcb.a + LIB_MAP = libtcb.map + NSS_MAP = libnss_tcb.map + +-all: $(LIBTCB_LONG) $(LIBNSS) $(LIBTCB_A) ++all: $(LIBTCB_LONG) $(LIBNSS) + + $(LIBTCB_A): libtcb_a.o + ar -cr $@ $< +@@ -36,9 +36,8 @@ install: + $(MKDIR) -p -m 755 $(DESTDIR)$(LIBDIR) + $(INSTALL) -m $(SHLIBMODE) $(LIBTCB_LONG) $(DESTDIR)$(SLIBDIR)/ + ln -sf $(LIBTCB_LONG) $(DESTDIR)$(SLIBDIR)/$(LIBTCB) +- ln -sf ../..$(SLIBDIR)/$(LIBTCB) $(DESTDIR)$(LIBDIR)/libtcb.so ++ ln -sf $(LIBTCB) $(DESTDIR)$(LIBDIR)/libtcb.so + $(INSTALL) -m $(SHLIBMODE) $(LIBNSS) $(DESTDIR)$(SLIBDIR)/ +- $(INSTALL) -m 644 $(LIBTCB_A) $(DESTDIR)$(LIBDIR)/ + + clean: + rm -f *.o *~ $(LIBTCB)* libtcb.so $(LIBNSS) *.a +diff --git a/progs/Makefile b/progs/Makefile +index c3a6879..e24f74b 100644 +--- a/progs/Makefile ++++ b/progs/Makefile +@@ -23,8 +23,8 @@ install-non-root: install-common + $(INSTALL) -m 700 $(CHKPWD) $(DESTDIR)$(LIBEXECDIR)/chkpwd/ + + install: install-common +- $(INSTALL) -d -o root -g chkpwd -m 710 $(DESTDIR)$(LIBEXECDIR)/chkpwd +- $(INSTALL) -m 2711 -o root -g shadow $(CHKPWD) \ ++ $(INSTALL) -d $(DESTDIR)$(LIBEXECDIR)/chkpwd ++ $(INSTALL) $(CHKPWD) \ + $(DESTDIR)$(LIBEXECDIR)/chkpwd/ + + install-common: |