Conflict in pkgs/development/libraries/libvirt/default.nix required manual adjustments. The fetched patch is already in src. I checked that libvirt builds.main
Vladimír Čunát
2 years ago
commit
f48c1fda6b
@ -0,0 +1,66 @@ |
||||
{ lib |
||||
, stdenvNoCC |
||||
, fetchzip |
||||
, copyDesktopItems |
||||
, jdk11 |
||||
, makeDesktopItem |
||||
, makeWrapper |
||||
, unzip |
||||
}: |
||||
|
||||
stdenvNoCC.mkDerivation rec { |
||||
pname = "irpf"; |
||||
version = "2022-1.0"; |
||||
|
||||
src = let |
||||
year = lib.head (lib.splitVersion version); |
||||
in fetchzip { |
||||
url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip"; |
||||
sha256 = "0h8f51ilvg7m6hlx0y5mpxhac90p32ksbrffw0hxdqbilgjz1s68"; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ]; |
||||
|
||||
desktopItems = [ |
||||
(makeDesktopItem rec { |
||||
name = pname; |
||||
exec = pname; |
||||
icon = "rfb64"; |
||||
desktopName = "Imposto de Renda Pessoa Física"; |
||||
comment = "Programa Oficial da Receita para elaboração do IRPF"; |
||||
categories = [ "Office" ]; |
||||
}) |
||||
]; |
||||
|
||||
installPhase = '' |
||||
runHook preInstall |
||||
|
||||
BASEDIR="$out/share/${pname}" |
||||
mkdir -p "$BASEDIR" |
||||
|
||||
cp -r help lib lib-modulos "$BASEDIR" |
||||
|
||||
install -Dm755 irpf.jar "$BASEDIR/${pname}.jar" |
||||
install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR" |
||||
|
||||
makeWrapper ${jdk11}/bin/java $out/bin/${pname} \ |
||||
--add-flags "-Dawt.useSystemAAFontSettings=on" \ |
||||
--add-flags "-Dswing.aatext=true" \ |
||||
--add-flags "-jar $BASEDIR/${pname}.jar" \ |
||||
--set _JAVA_AWT_WM_NONREPARENTING 1 \ |
||||
--set AWT_TOOLKIT MToolkit |
||||
|
||||
mkdir -p $out/share/pixmaps |
||||
unzip -j lib/ppgd-icones-4.0.jar icones/rfb64.png -d $out/share/pixmaps |
||||
|
||||
runHook postInstall |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Programa Oficial da Receita para elaboração do IRPF"; |
||||
homepage = "https://www.gov.br/receitafederal/pt-br"; |
||||
license = licenses.unfree; |
||||
platforms = platforms.all; |
||||
maintainers = with maintainers; [ atila ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,70 @@ |
||||
{ stdenv |
||||
, lib |
||||
, fetchFromGitLab |
||||
|
||||
, gettext |
||||
, meson |
||||
, ninja |
||||
, pkg-config |
||||
, python3 |
||||
, rustPlatform |
||||
, wrapGAppsHook |
||||
|
||||
, appstream-glib |
||||
, desktop-file-utils |
||||
, glib |
||||
, gtk4 |
||||
, libadwaita |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "gnome-obfuscate"; |
||||
version = "0.0.4"; |
||||
|
||||
src = fetchFromGitLab { |
||||
domain = "gitlab.gnome.org"; |
||||
owner = "World"; |
||||
repo = "Obfuscate"; |
||||
rev = version; |
||||
sha256 = "sha256-P8Y2Eizn1BMZXuFjGMXF/3oAUzI8ZNTrnbLyU+V6uk4="; |
||||
}; |
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball { |
||||
inherit src; |
||||
name = "${pname}-${version}"; |
||||
sha256 = "sha256-5MzWz5NH2sViIfaP8xOQLreEal5TYkji11VaUgieT3U="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
gettext |
||||
glib |
||||
meson |
||||
ninja |
||||
pkg-config |
||||
python3 |
||||
rustPlatform.cargoSetupHook |
||||
rustPlatform.rust.cargo |
||||
rustPlatform.rust.rustc |
||||
wrapGAppsHook |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
appstream-glib |
||||
desktop-file-utils |
||||
glib |
||||
gtk4 |
||||
libadwaita |
||||
]; |
||||
|
||||
postPatch = '' |
||||
patchShebangs build-aux/meson_post_install.py |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "Censor private information"; |
||||
homepage = "https://gitlab.gnome.org/World/obfuscate"; |
||||
license = licenses.gpl3Plus; |
||||
maintainers = with maintainers; [ fgaz ]; |
||||
platforms = platforms.all; |
||||
}; |
||||
} |
||||
@ -0,0 +1,48 @@ |
||||
{ lib, stdenv, fetchFromGitHub |
||||
, autoconf, autoconf-archive, automake, glib, intltool, libtool, pkg-config |
||||
, gnome, gnupg, gtk3, udisks |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "eos-installer"; |
||||
version = "4.0.3"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "endlessm"; |
||||
repo = "eos-installer"; |
||||
rev = "Release_${version}"; |
||||
sha256 = "1nl6vim5dd83kvskmf13xp9d6zx39fayz4z0wqwf7xf4nwl07gwz"; |
||||
fetchSubmodules = true; |
||||
}; |
||||
|
||||
strictDeps = true; |
||||
nativeBuildInputs = [ |
||||
autoconf autoconf-archive automake glib intltool libtool pkg-config |
||||
]; |
||||
buildInputs = [ gnome.gnome-desktop gtk3 udisks ]; |
||||
|
||||
preConfigure = '' |
||||
./autogen.sh |
||||
''; |
||||
|
||||
configureFlags = [ |
||||
"--libexecdir=${placeholder "out"}/bin" |
||||
"--localstatedir=/var" |
||||
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" |
||||
]; |
||||
|
||||
# These are for runtime, so can't be discovered from PATH, which |
||||
# is constructed from nativeBuildInputs. |
||||
GPG_PATH = "${gnupg}/bin/gpg"; |
||||
GPGCONF_PATH = "${gnupg}/bin/gpgconf"; |
||||
|
||||
enableParallelBuilding = true; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/endlessm/eos-installer"; |
||||
description = "Installer UI which writes images to disk"; |
||||
license = licenses.gpl2Plus; |
||||
maintainers = with maintainers; [ qyliss ]; |
||||
platforms = platforms.linux; |
||||
}; |
||||
} |
||||
@ -0,0 +1,60 @@ |
||||
{ lib |
||||
, rustPlatform |
||||
, fetchFromGitHub |
||||
, pkg-config |
||||
, openssl |
||||
, stdenv |
||||
, dbus |
||||
, sqlite |
||||
, Security |
||||
, SystemConfiguration |
||||
, libiconv |
||||
, testVersion |
||||
, jujutsu |
||||
}: |
||||
|
||||
rustPlatform.buildRustPackage rec { |
||||
pname = "jujutsu"; |
||||
version = "0.3.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "martinvonz"; |
||||
repo = "jj"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8="; |
||||
}; |
||||
|
||||
cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE="; |
||||
|
||||
# Needed to get openssl-sys to use pkg-config. |
||||
OPENSSL_NO_VENDOR = 1; |
||||
|
||||
nativeBuildInputs = [ |
||||
pkg-config |
||||
]; |
||||
|
||||
buildInputs = [ |
||||
openssl |
||||
dbus |
||||
sqlite |
||||
] ++ lib.optionals stdenv.isDarwin [ |
||||
Security |
||||
SystemConfiguration |
||||
libiconv |
||||
]; |
||||
|
||||
passthru.tests = { |
||||
version = testVersion { |
||||
package = jujutsu; |
||||
command = "jj --version"; |
||||
}; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "A Git-compatible DVCS that is both simple and powerful"; |
||||
homepage = "https://github.com/martinvonz/jj"; |
||||
changelog = "https://github.com/martinvonz/jj/blob/v${version}/CHANGELOG.md"; |
||||
license = licenses.asl20; |
||||
maintainers = with maintainers; [ _0x4A6F ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,12 @@ |
||||
diff --git a/rust/hg-core/src/lock.rs b/rust/hg-core/src/lock.rs
|
||||
--- a/rust/hg-core/src/lock.rs
|
||||
+++ b/rust/hg-core/src/lock.rs
|
||||
@@ -145,7 +145,7 @@ lazy_static::lazy_static! {
|
||||
|
||||
/// Same as https://github.com/python/cpython/blob/v3.10.0/Modules/socketmodule.c#L5414
|
||||
const BUFFER_SIZE: usize = 1024;
|
||||
- let mut buffer = [0_i8; BUFFER_SIZE];
|
||||
+ let mut buffer = [0 as libc::c_char; BUFFER_SIZE];
|
||||
let hostname_bytes = unsafe {
|
||||
let result = libc::gethostname(buffer.as_mut_ptr(), BUFFER_SIZE);
|
||||
if result != 0 {
|
||||
@ -1,18 +1,21 @@ |
||||
{ lib, stdenv, fetchurl, tcl, tk }: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "tkcvs"; |
||||
version = "8.2.1"; |
||||
pname = "tkrev"; |
||||
version = "9.4.1"; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://sourceforge/tkcvs/tkcvs_${lib.replaceStrings ["."] ["_"] version}.tar.gz"; |
||||
sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; |
||||
url = "mirror://sourceforge/tkcvs/tkrev_${version}.tar.gz"; |
||||
sha256 = "sha256-WHDZPShEB9Q+Bjbb37mogJLUZk2GuWoO8bz+Zydc7i4="; |
||||
}; |
||||
|
||||
buildInputs = [ tcl tk ]; |
||||
|
||||
patchPhase = '' |
||||
sed -e 's@exec wish@exec ${tk}/bin/wish@' -i tkcvs/tkcvs.tcl tkdiff/tkdiff |
||||
for file in tkrev/tkrev.tcl tkdiff/tkdiff; do |
||||
substituteInPlace "$file" \ |
||||
--replace "exec wish" "exec ${tk}/bin/wish" |
||||
done |
||||
''; |
||||
|
||||
installPhase = '' |
||||
@ -1,49 +0,0 @@ |
||||
From 9e4932ae99946b1a08ab5b5345fd2bc3486e54a5 Mon Sep 17 00:00:00 2001
|
||||
From: aszlig <aszlig@nix.build>
|
||||
Date: Mon, 18 Mar 2019 13:21:01 +0100
|
||||
Subject: [PATCH] 9pfs: Ignore O_NOATIME open flag
|
||||
|
||||
Since Linux 4.19, overlayfs uses the O_NOATIME flag on its lowerdir,
|
||||
which in turn causes errors when the Nix store is mounted in the guest
|
||||
because the file owner of the store paths typically don't match the
|
||||
owner of the QEMU process.
|
||||
|
||||
After submitting a patch to the overlayfs mailing list[1], it turns out
|
||||
that my patch was incomplete[2] and needs a bit more rework.
|
||||
|
||||
So instead of using an incomplete kernel patch in nixpkgs, which affects
|
||||
*all* users of overlayfs, not just NixOS VM tests, I decided that for
|
||||
now it's better to patch QEMU instead.
|
||||
|
||||
The change here really only ignores the O_NOATIME flag so that the
|
||||
behaviour is similar to what NFS does. From open(2):
|
||||
|
||||
This flag may not be effective on all filesystems. One example is NFS,
|
||||
where the server maintains the access time.
|
||||
|
||||
This change is therefore only temporary until the final fix lands in the
|
||||
stable kernel releases.
|
||||
|
||||
[1]: https://www.spinics.net/lists/linux-unionfs/msg06755.html
|
||||
[2]: https://www.spinics.net/lists/linux-unionfs/msg06756.html
|
||||
|
||||
Signed-off-by: aszlig <aszlig@nix.build>
|
||||
---
|
||||
hw/9pfs/9p.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
|
||||
index a6d6b3f835..4eb26e2294 100644
|
||||
--- a/hw/9pfs/9p.c
|
||||
+++ b/hw/9pfs/9p.c
|
||||
@@ -139,7 +139,6 @@ static int dotl_to_open_flags(int flags)
|
||||
{ P9_DOTL_DSYNC, O_DSYNC },
|
||||
{ P9_DOTL_FASYNC, FASYNC },
|
||||
#ifndef CONFIG_DARWIN
|
||||
- { P9_DOTL_NOATIME, O_NOATIME },
|
||||
/*
|
||||
* On Darwin, we could map to F_NOCACHE, which is
|
||||
* similar, but doesn't quite have the same
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1,33 +0,0 @@ |
||||
diff -u a/Makefile b/Makefile
|
||||
--- a/Makefile 2020-12-27 18:48:53.934098765 +0100
|
||||
+++ b/Makefile 2020-12-27 18:50:44.022674117 +0100
|
||||
@@ -19,13 +19,13 @@
|
||||
# http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
|
||||
PREFIX ?= /usr/local
|
||||
EXEC_PREFIX = $(PREFIX)
|
||||
-BINDIR = $(EXEC_PREFIX)/bin
|
||||
+BINDIR ?= $(EXEC_PREFIX)/bin
|
||||
DATAROOTDIR = $(PREFIX)/share
|
||||
DOCDIR = $(DATAROOTDIR)/doc/$(CPROG)
|
||||
SYSCONFDIR ?= $(PREFIX)/etc
|
||||
HTMLDIR = $(DOCDIR)
|
||||
-INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
|
||||
-LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib
|
||||
+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include
|
||||
+LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib
|
||||
PID_FILE ?= /var/run/$(CPROG).pid
|
||||
|
||||
# build tools
|
||||
@@ -337,10 +337,10 @@
|
||||
install -m 755 $(CPROG) "$(BINDIR)/"
|
||||
|
||||
install-headers:
|
||||
- install -m 644 $(HEADERS) "$(INCLUDEDIR)"
|
||||
+ install -m 644 $(HEADERS) "$(INCLUDEDIR)/"
|
||||
|
||||
install-lib: lib$(CPROG).a
|
||||
- install -m 644 $< "$(LIBDIR)"
|
||||
+ install -m 644 $< "$(LIBDIR)/"
|
||||
|
||||
install-slib: lib$(CPROG).so
|
||||
$(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g'))
|
||||
@ -1,14 +0,0 @@ |
||||
diff --git a/src/ch/meson.build b/src/ch/meson.build
|
||||
index e34974d56c..4767763c2c 100644
|
||||
--- a/src/ch/meson.build
|
||||
+++ b/src/ch/meson.build
|
||||
@@ -68,7 +68,7 @@ if conf.has('WITH_CH')
|
||||
}
|
||||
|
||||
virt_install_dirs += [
|
||||
- localstatedir / 'lib' / 'libvirt' / 'ch',
|
||||
- runstatedir / 'libvirt' / 'ch',
|
||||
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'ch',
|
||||
+ install_prefix + runstatedir / 'libvirt' / 'ch',
|
||||
]
|
||||
endif
|
||||
@ -0,0 +1,46 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, poetry-core |
||||
, pysigma |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "pysigma-backend-splunk"; |
||||
version = "0.1.1"; |
||||
format = "pyproject"; |
||||
|
||||
disabled = pythonOlder "3.8"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "SigmaHQ"; |
||||
repo = "pySigma-backend-splunk"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-AGT+7BKtINe2ukmomYyoUa5PHYAH1N0tUTtbyjMD+kw="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pysigma |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"sigma.backends.splunk" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Library to support Splunk for pySigma"; |
||||
homepage = "https://github.com/SigmaHQ/pySigma-backend-splunk"; |
||||
license = with licenses; [ lgpl21Only ]; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,46 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, poetry-core |
||||
, pysigma |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "pysigma-pipeline-crowdstrike"; |
||||
version = "0.1.3"; |
||||
format = "pyproject"; |
||||
|
||||
disabled = pythonOlder "3.8"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "SigmaHQ"; |
||||
repo = "pySigma-pipeline-crowdstrike"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-JNJHKydMzKreN+6liLlGMT1CFBUr/IX8Ah+exddKR3g="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pysigma |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"sigma.pipelines.crowdstrike" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Library to support CrowdStrike pipeline for pySigma"; |
||||
homepage = "https://github.com/SigmaHQ/pySigma-pipeline-crowdstrike"; |
||||
license = with licenses; [ lgpl21Only ]; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,46 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, poetry-core |
||||
, pysigma |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "pysigma-pipeline-sysmon"; |
||||
version = "0.1.1"; |
||||
format = "pyproject"; |
||||
|
||||
disabled = pythonOlder "3.8"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "SigmaHQ"; |
||||
repo = "pySigma-pipeline-sysmon"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-BBJt2SAbnPEzIwJ+tXW4NmA4Nrb/glIaPlnmYHLoMD0="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pysigma |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"sigma.pipelines.sysmon" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Library to support Sysmon pipeline for pySigma"; |
||||
homepage = "https://github.com/SigmaHQ/pySigma-pipeline-sysmon"; |
||||
license = with licenses; [ lgpl21Only ]; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,66 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, fetchpatch |
||||
, poetry-core |
||||
, pyparsing |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
, pyyaml |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "pysigma"; |
||||
version = "0.3.2"; |
||||
format = "pyproject"; |
||||
|
||||
disabled = pythonOlder "3.8"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "SigmaHQ"; |
||||
repo = "pySigma"; |
||||
rev = "v${version}"; |
||||
hash = "sha256-V/E2rZqVrk0kIvk+hPhNcAifhMM/rN3mk3pB+CGd43w="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
pyparsing |
||||
pyyaml |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
patches = [ |
||||
# Switch to poetry-core, https://github.com/SigmaHQ/pySigma/pull/31 |
||||
(fetchpatch { |
||||
name = "switch-to-poetry-core.patch"; |
||||
url = "https://github.com/SigmaHQ/pySigma/commit/b7a852d18852007da90c2ec35bff347c97b36f07.patch"; |
||||
sha256 = "sha256-zgg8Bsc37W2uuQluFpIZT4jHCQaitY2ZgS93Wk6Hxt0="; |
||||
}) |
||||
]; |
||||
|
||||
postPatch = '' |
||||
# https://github.com/SigmaHQ/pySigma/issues/32 |
||||
# https://github.com/SigmaHQ/pySigma/issues/33 |
||||
substituteInPlace pyproject.toml \ |
||||
--replace 'pyparsing = "^2.4.7"' 'pyparsing = "*"' \ |
||||
--replace 'pyyaml = "^5.3.1"' 'pyyaml = "*"' |
||||
''; |
||||
|
||||
pythonImportsCheck = [ |
||||
"sigma" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Library to parse and convert Sigma rules into queries"; |
||||
homepage = "https://github.com/SigmaHQ/pySigma"; |
||||
license = with licenses; [ lgpl21Only ]; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,146 @@ |
||||
--- a/data/klavaro.glade (revision 137)
|
||||
+++ b/data/klavaro.glade (working copy)
|
||||
@@ -311,7 +311,7 @@
|
||||
<object class="GtkImage" id="image24">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -708,7 +708,7 @@
|
||||
<property name="can-default">True</property>
|
||||
<property name="has-default">True</property>
|
||||
<property name="tooltip-text" translatable="yes">Drag and drop text here to practice with it.</property>
|
||||
- <property name="secondary-icon-name">gtk-clear</property>
|
||||
+ <property name="secondary-icon-name">edit-clear</property>
|
||||
<property name="secondary-icon-tooltip-text" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property>
|
||||
<property name="secondary-icon-tooltip-markup" translatable="yes">Press here to restart the exercise. Hotkey: [Ctrl-R]</property>
|
||||
<signal name="activate" handler="on_entry_mesg_activate" after="yes" swapped="no"/>
|
||||
@@ -1232,7 +1232,7 @@
|
||||
<object class="GtkImage" id="image27">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -1352,7 +1352,7 @@
|
||||
<object class="GtkImage" id="image23">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-open</property>
|
||||
+ <property name="icon-name">document-open</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
@@ -1510,7 +1510,7 @@
|
||||
<object class="GtkImage" id="image11">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-open</property>
|
||||
+ <property name="icon-name">document-open</property>
|
||||
<property name="icon_size">2</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -1557,7 +1557,7 @@
|
||||
<object class="GtkImage" id="image6">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-paste</property>
|
||||
+ <property name="icon-name">edit-paste</property>
|
||||
<property name="icon_size">2</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -1604,7 +1604,7 @@
|
||||
<object class="GtkImage" id="image19">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
<property name="icon_size">2</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -2051,7 +2051,7 @@
|
||||
<object class="GtkImage" id="image14">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-delete</property>
|
||||
+ <property name="icon-name">edit-delete</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2343,7 +2343,7 @@
|
||||
<object class="GtkImage" id="image3">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-media-rewind</property>
|
||||
+ <property name="icon-name">media-seek-backward</property>
|
||||
<property name="icon_size">1</property>
|
||||
</object>
|
||||
</child>
|
||||
@@ -2418,7 +2418,7 @@
|
||||
<object class="GtkImage" id="image20">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-go-back</property>
|
||||
+ <property name="icon-name">go-previous</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2469,7 +2469,7 @@
|
||||
<object class="GtkImage" id="image18">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-go-forward</property>
|
||||
+ <property name="icon-name">go-next</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2577,7 +2577,7 @@
|
||||
<object class="GtkImage" id="image13">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-save</property>
|
||||
+ <property name="icon-name">document-save</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -2825,7 +2825,7 @@
|
||||
<object class="GtkImage" id="image_basic">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-strikethrough</property>
|
||||
+ <property name="icon-name">format-text-strikethrough</property>
|
||||
<property name="icon_size">6</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -2901,7 +2901,7 @@
|
||||
<object class="GtkImage" id="image_adapt">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-bold</property>
|
||||
+ <property name="icon-name">format-text-bold</property>
|
||||
<property name="icon_size">6</property>
|
||||
</object>
|
||||
<packing>
|
||||
@@ -3630,7 +3630,7 @@
|
||||
<object class="GtkImage" id="image_top10_publish">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-goto-top</property>
|
||||
+ <property name="icon-name">go-top</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -3678,7 +3678,7 @@
|
||||
<object class="GtkImage" id="image_top10_update">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
- <property name="icon-name">gtk-goto-bottom</property>
|
||||
+ <property name="icon-name">go-bottom</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@ -0,0 +1,71 @@ |
||||
--- a/src/translation.c (revision 137)
|
||||
+++ b/src/translation.c (working copy)
|
||||
@@ -257,23 +257,23 @@
|
||||
* Private auxiliar function
|
||||
*/
|
||||
static gboolean
|
||||
-trans_lang_get_similar (gchar * test)
|
||||
+trans_lang_get_similar (gchar ** test)
|
||||
{
|
||||
gint i;
|
||||
gchar aux_code_2[3];
|
||||
|
||||
/* Prefer C over en_GB for English variants other than en_GB. (Debian patch 02) */
|
||||
- if (g_str_has_prefix (test, "en"))
|
||||
+ if (g_str_has_prefix (*test, "en"))
|
||||
{
|
||||
- g_free (test);
|
||||
- test = g_strdup ("C");
|
||||
+ g_free (*test);
|
||||
+ *test = g_strdup ("C");
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
- if (g_str_equal (test, "C"))
|
||||
+ if (g_str_equal (*test, "C"))
|
||||
return TRUE;
|
||||
|
||||
- strncpy (aux_code_2, test, 2);
|
||||
+ strncpy (aux_code_2, *test, 2);
|
||||
aux_code_2[2] = '\0';
|
||||
|
||||
for (i = 0; i < lang_num; i++)
|
||||
@@ -280,15 +280,15 @@
|
||||
{
|
||||
if (strstr (lang[i].code, aux_code_2))
|
||||
{
|
||||
- g_free (test);
|
||||
- test = g_strdup (lang[i].code);
|
||||
+ g_free (*test);
|
||||
+ *test = g_strdup (lang[i].code);
|
||||
break;
|
||||
}
|
||||
}
|
||||
- if (i == lang_num && g_str_has_prefix (test, "en"))
|
||||
+ if (i == lang_num && g_str_has_prefix (*test, "en"))
|
||||
{
|
||||
- g_free (test);
|
||||
- test = g_strdup ("C");
|
||||
+ g_free (*test);
|
||||
+ *test = g_strdup ("C");
|
||||
return (TRUE);
|
||||
}
|
||||
return (i == lang_num ? FALSE : TRUE);
|
||||
@@ -356,7 +356,7 @@
|
||||
lang_ok = (i == 0 ? TRUE : FALSE);
|
||||
break;
|
||||
}
|
||||
- lang_ok = trans_lang_get_similar (tmp_code);
|
||||
+ lang_ok = trans_lang_get_similar (&tmp_code);
|
||||
if (lang_ok == TRUE)
|
||||
break;
|
||||
g_free (tmp_code);
|
||||
@@ -368,7 +368,7 @@
|
||||
tmp_code = g_win32_getlocale ();
|
||||
lang_ok = trans_lang_is_available (tmp_code);
|
||||
if (lang_ok == FALSE)
|
||||
- lang_ok = trans_lang_get_similar (tmp_code);
|
||||
+ lang_ok = trans_lang_get_similar (&tmp_code);
|
||||
#endif
|
||||
}
|
||||
if (tmp_code == NULL)
|
||||
@ -1,26 +0,0 @@ |
||||
{ lib, stdenv, fetchurl }: |
||||
|
||||
# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'. |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "bsd-fingerd"; |
||||
version = "0.17"; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://ibiblioPubLinux/system/network/finger/bsd-finger-${version}.tar.gz"; |
||||
sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; |
||||
}; |
||||
|
||||
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; |
||||
|
||||
patches = [ ./ubuntu-0.17-9.patch ]; |
||||
|
||||
preBuild = "cd fingerd"; |
||||
|
||||
preInstall = "mkdir -p $out/man/man8 $out/sbin "; |
||||
|
||||
meta = with lib; { |
||||
platforms = platforms.linux; |
||||
license = licenses.bsdOriginal; |
||||
}; |
||||
} |
||||
@ -1,67 +0,0 @@ |
||||
--- bsd-finger-0.17.orig/fingerd/fingerd.8
|
||||
+++ bsd-finger-0.17/fingerd/fingerd.8
|
||||
@@ -36,10 +36,10 @@
|
||||
.Dt FINGERD 8
|
||||
.Os "Linux NetKit (0.17)"
|
||||
.Sh NAME
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
.Nd remote user information server
|
||||
.Sh SYNOPSIS
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
.Op Fl wulf
|
||||
.Op Fl pL Ar path
|
||||
.Op Fl t Ar timeout
|
||||
@@ -61,7 +61,7 @@
|
||||
banner
|
||||
which also shows some informations (e.g. uptime, operating system name and
|
||||
release) about the system the
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
is running on. Some sites may consider this a security risk as it
|
||||
gives out information that may be useful to crackers.
|
||||
.Pp
|
||||
@@ -85,7 +85,7 @@
|
||||
.Pp
|
||||
The
|
||||
.Fl p
|
||||
-option allows specification of an alternate location for fingerd to find
|
||||
+option allows specification of an alternate location for in.fingerd to find
|
||||
the
|
||||
.Dq finger
|
||||
program. The
|
||||
@@ -97,7 +97,7 @@
|
||||
option specifies the time to wait for a request before closing the
|
||||
connection. A value of 0 waits forever. The default is 60 seconds.
|
||||
.Pp
|
||||
-Options to fingerd should be specified in
|
||||
+Options to in.fingerd should be specified in
|
||||
.Pa /etc/inetd.conf .
|
||||
.Pp
|
||||
The finger protocol consists mostly of specifying command arguments.
|
||||
@@ -105,12 +105,12 @@
|
||||
.Xr inetd 8
|
||||
.Dq super-server
|
||||
runs
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
for
|
||||
.Tn TCP
|
||||
requests received on port 79.
|
||||
Once connected
|
||||
-.Nm fingerd
|
||||
+.Nm in.fingerd
|
||||
reads a single command line
|
||||
terminated by a
|
||||
.Aq Tn CRLF
|
||||
--- bsd-finger-0.17.orig/fingerd/fingerd.c
|
||||
+++ bsd-finger-0.17/fingerd/fingerd.c
|
||||
@@ -55,6 +55,7 @@
|
||||
#include <netinet/in.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <sys/wait.h>
|
||||
+#include <sys/socket.h>
|
||||
|
||||
#include "pathnames.h"
|
||||
#include "../version.h"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue