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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-14 18:54:05 +00:00 committed by GitHub
commit 183b673b64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
60 changed files with 971 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View File

@ -8671,6 +8671,12 @@
githubId = 2666479;
name = "Y Nguyen";
};
superherointj = {
name = "Sérgio G.";
email = "5861043+superherointj@users.noreply.github.com";
github = "superherointj";
githubId = 5861043;
};
SuperSandro2000 = {
email = "sandro.jaeckel@gmail.com";
github = "SuperSandro2000";

6
maintainers/scripts/nix-generate-from-cpan.nix
View File

@ -1,4 +1,4 @@
{ stdenv, makeWrapper, perl, perlPackages }:
{ stdenv, lib, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation {
name = "nix-generate-from-cpan-3";
@ -18,8 +18,8 @@ stdenv.mkDerivation {
'';
meta = {
maintainers = with stdenv.lib.maintainers; [ eelco rycee ];
maintainers = with lib.maintainers; [ eelco rycee ];
description = "Utility to generate a Nix expression for a Perl package from CPAN";
platforms = stdenv.lib.platforms.unix;
platforms = lib.platforms.unix;
};
}

1
nixos/modules/module-list.nix
View File

@ -956,6 +956,7 @@
./services/x11/urxvtd.nix
./services/x11/window-managers/awesome.nix
./services/x11/window-managers/default.nix
./services/x11/window-managers/clfswm.nix
./services/x11/window-managers/fluxbox.nix
./services/x11/window-managers/icewm.nix
./services/x11/window-managers/bspwm.nix

4
nixos/modules/services/x11/window-managers/clfswm.nix
View File

@ -15,10 +15,10 @@ in
services.xserver.windowManager.session = singleton {
name = "clfswm";
start = ''
${pkgs.clfswm}/bin/clfswm &
${pkgs.lispPackages.clfswm}/bin/clfswm &
waitPID=$!
'';
};
environment.systemPackages = [ pkgs.clfswm ];
environment.systemPackages = [ pkgs.lispPackages.clfswm ];
};
}

1
nixos/modules/services/x11/window-managers/default.nix
View File

@ -13,6 +13,7 @@ in
./berry.nix
./bspwm.nix
./cwm.nix
./clfswm.nix
./dwm.nix
./evilwm.nix
./exwm.nix

1
pkgs/applications/editors/kakoune/plugins/default.nix
View File

@ -13,4 +13,5 @@
kak-prelude = pkgs.callPackage ./kak-prelude.nix { };
kak-vertical-selection = pkgs.callPackage ./kak-vertical-selection.nix { };
openscad-kak = pkgs.callPackage ./openscad.kak.nix { };
quickscope-kak = pkgs.callPackage ./quickscope.kak.nix { };
}

29
pkgs/applications/editors/kakoune/plugins/quickscope.kak.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchgit, lua5_3 }:
stdenv.mkDerivation rec {
pname = "quickscope-kak";
version = "1.0.0";
src = fetchgit {
url = "https://git.sr.ht/~voroskoi/quickscope.kak";
rev = "v${version}";
sha256 = "0y1g3zpa2ql8l9rl5i2w84bka8a09kig9nq9zdchaff5pw660mcx";
};
buildInputs = [ lua5_3 ];
installPhase = ''
mkdir -p $out/share/kak/autoload/plugins/
cp quickscope.* $out/share/kak/autoload/plugins/
# substituteInPlace does not like the pipe
sed -e 's,[|] *lua,|${lua5_3}/bin/lua,' quickscope.kak >$out/share/kak/autoload/plugins/quickscope.kak
'';
meta = with stdenv.lib; {
description = "Highlight f and t jump positions";
homepage = "https://sr.ht/~voroskoi/quickscope.kak/";
license = licenses.unlicense;
maintainers = with maintainers; [ eraserhd ];
platforms = platforms.all;
};
}

2
pkgs/applications/graphics/zgrviewer/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
cp -r target/* "$out/share/java/zvtm/"
echo '#!${runtimeShell}' > "$out/bin/zgrviewer"
echo "${jre}/lib/openjdk/jre/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer"
echo "${jre}/bin/java -jar '$out/share/java/zvtm/zgrviewer-${version}.jar' \"\$@\"" >> "$out/bin/zgrviewer"
chmod a+x "$out/bin/zgrviewer"
'';
meta = {

1
pkgs/applications/networking/browsers/webbrowser/default.nix
View File

@ -104,5 +104,6 @@ in stdenv.mkDerivation rec {
license = [ licenses.mpl20 licenses.gpl3 ];
maintainers = with maintainers; [ TheBrainScrambler ];
platforms = [ "i686-linux" "x86_64-linux" ];
broken = true; # 2021-01-07
};
}

6
pkgs/applications/networking/cluster/argo/default.nix
View File

@ -19,16 +19,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "2.11.8";
version = "2.12.4";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "19nkkj69506759qjfrz6d7j57z8rqjslgfrdrkx01ri68cil4mfh";
sha256 = "04r3y71l9849wlhpzzcg2wcqnqdp5nnnhy4s205rp9xswa3mw0k3";
};
vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray";
vendorSha256 = "0m24wi91638zyrp7mpri4862dbx1p0glscjd0hdy0xb56vcr3i09";
doCheck = false;

13
pkgs/applications/networking/instant-messengers/profanity/default.nix
View File

@ -1,7 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
, cmocka, libmicrohttpd, expat, sqlite, libmesode, fetchpatch
, autoconf-archive
, cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive
, autoAwaySupport ? true, libXScrnSaver ? null, libX11 ? null
, notifySupport ? true, libnotify ? null, gdk-pixbuf ? null
@ -22,20 +21,16 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "profanity";
version = "0.9.5";
version = "0.10.0";
src = fetchFromGitHub {
owner = "profanity-im";
repo = "profanity";
rev = version;
sha256 = "14vbblf639f90bb4npg2xv53cpvk9am9ic4pmc1vnv4m3zsndjg5";
sha256 = "0a9rzhnivxcr8v02xxzrbck7pvvv4c66ap2zy0gzxhri5p8ac03r";
};
patches = [
(fetchpatch {
url = "https://github.com/profanity-im/profanity/commit/54667c022f17bdb547c3b8b4eec1c2889c9d60f3.patch";
sha256 = "0aqrq45im1qnq308hyhh7dqbggzmcqb0b868wr5v8v08pd94s45k";
})
./patches/packages-osx.patch
];
@ -80,6 +75,8 @@ stdenv.mkDerivation rec {
homepage = "http://www.profanity.im/";
license = licenses.gpl3Plus;
platforms = platforms.unix;
changelog = "https://github.com/profanity-im/profanity/releases/tag/${version}";
downloadPage = "https://github.com/profanity-im/profanity/releases/";
maintainers = [ maintainers.devhell ];
updateWalker = true;
};

2
pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
View File

@ -3,7 +3,7 @@
let
inherit (python27Packages) python;
requirements = (import ./requirements.nix {
inherit stdenv fetchurl;
inherit lib fetchurl;
pythonPackages = python27Packages;
});

8
pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix
View File

@ -1,5 +1,5 @@
{ fetchurl
, lib, stdenv
, lib
, pythonPackages
}:
@ -8,7 +8,7 @@ let
xe = buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
name = lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42";
@ -28,7 +28,7 @@ in {
pyfeed = (buildPythonPackage rec {
url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
name = lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
@ -49,7 +49,7 @@ in {
wokkel = buildPythonPackage (rec {
url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz";
name = stdenv.lib.nameFromURL url ".tar";
name = lib.nameFromURL url ".tar";
src = fetchurl {
inherit url;
sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml";

6
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -86,6 +86,12 @@ stdenv.mkDerivation rec {
gdb man emacs
];
# Expects there to always be a thread with ID
# thread:0000000000000009, but notmuch new is non-deterministic so
# this isn't always the case. Upstream bug report:
# https://nmbug.notmuchmail.org/nmweb/show/871reno6g7.fsf%40alyssa.is
NOTMUCH_SKIP_TESTS = "lib-thread";
installTargets = [ "install" "install-man" "install-info" ];
postInstall = stdenv.lib.optionalString withEmacs ''

35
pkgs/applications/science/logic/opensmt/default.nix
View File

@ -1,25 +1,38 @@
{ lib, stdenv, fetchurl, automake, libtool, autoconf, intltool, perl
, gmpxx, flex, bison
{ stdenv, lib, fetchFromGitHub
, cmake, libedit, gmpxx, bison, flex
, enableReadline ? false, readline
, gtest
}:
stdenv.mkDerivation rec {
pname = "opensmt";
version = "20101017";
version = "2.0.1";
src = fetchurl {
url = "http://opensmt.googlecode.com/files/opensmt_src_${version}.tgz";
sha256 = "0xrky7ixjaby5x026v7hn72xh7d401w9jhccxjn0khhn1x87p2w1";
src = fetchFromGitHub {
owner = "usi-verification-and-security";
repo = "opensmt";
rev = "v${version}";
sha256 = "uoIcXWsxxRsIuFsou3RcN9e48lc7cWMgRPVJLFVslDE=";
};
buildInputs = [ automake libtool autoconf intltool perl gmpxx flex bison ];
nativeBuildInputs = [ cmake bison flex ];
buildInputs = [ libedit gmpxx ]
++ lib.optional enableReadline readline;
preConfigure = ''
substituteInPlace test/CMakeLists.txt \
--replace 'FetchContent_Populate' '#FetchContent_Populate'
'';
cmakeFlags = [
"-Dgoogletest_SOURCE_DIR=${gtest.src}"
"-Dgoogletest_BINARY_DIR=./gtest-build"
];
meta = with lib; {
description = "A satisfiability modulo theory (SMT) solver";
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
license = licenses.gpl3;
homepage = "http://code.google.com/p/opensmt/";
broken = true;
downloadPage = "http://code.google.com/p/opensmt/downloads/list";
license = if enableReadline then licenses.gpl2Plus else licenses.mit;
homepage = "https://github.com/usi-verification-and-security/opensmt";
};
}

4
pkgs/data/icons/luna-icons/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "luna-icons";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "darkomarko42";
repo = pname;
rev = version;
sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353";
sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p";
};
nativeBuildInputs = [

6
pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix
View File

@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-draw-on-your-screen";
version = "6";
version = "10";
src = fetchgit {
url = "https://framagit.org/abakkk/DrawOnYourScreen/";
rev = "v${version}";
sha256 = "05i20ii8lv6mg56rz8lng80dx35l6g45j8wr7jgbp591hg0spj1w";
sha256 = "07adzg3mf6k0pmd9lc358w0w3l4pr3p6374day1qhmci2p4zxq6p";
};
uuid = "drawOnYourScreen@abakkk.framagit.org";
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "A drawing extension for GNOME Shell";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ericdallo ];
maintainers = with maintainers; [ ericdallo ahuzik ];
platforms = gnome3.gnome-shell.meta.platforms;
homepage = "https://framagit.org/abakkk/DrawOnYourScreen";
};

3
pkgs/desktops/lxqt/liblxqt/default.nix
View File

@ -39,6 +39,9 @@ mkDerivation rec {
xorg.libXScrnSaver
];
# convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources
patches = [ ./fix-application-path.patch ];
postPatch = ''
sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt
'';

23
pkgs/desktops/lxqt/liblxqt/fix-application-path.patch Normal file
View File

@ -0,0 +1,23 @@
--- a/lxqtapplication.cpp
+++ b/lxqtapplication.cpp
@@ -77,7 +77,7 @@ Application::Application(int &argc, char** argv, bool handleQuitSignals)
void Application::updateTheme()
{
- const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName();
+ const QString styleSheetKey = QFileInfo(applicationFilePath()).fileName().mid(1).chopped(8);
setStyleSheet(lxqtTheme.qss(styleSheetKey));
Q_EMIT themeChanged();
}
--- a/lxqttranslator.cpp
+++ b/lxqttranslator.cpp
@@ -147,7 +147,7 @@ bool Translator::translateApplication(const QString &applicationName)
if (!applicationName.isEmpty())
return translate(applicationName);
else
- return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName());
+ return translate(QFileInfo(QCoreApplication::applicationFilePath()).baseName().mid(1).chopped(8));
}

4
pkgs/development/compilers/idris2/default.nix
View File

@ -5,13 +5,13 @@
# Uses scheme to bootstrap the build of idris2
stdenv.mkDerivation rec {
pname = "idris2";
version = "0.2.2";
version = "0.3.0";
src = fetchFromGitHub {
owner = "idris-lang";
repo = "Idris2";
rev = "v${version}";
sha256 = "18m483vccijfh9z6x4zgi37fql3q765x3ypkwixv3rwq9nxnd6hm";
sha256 = "0sa2lpb7n6xqfknwld9rzm4bnb6qcd0ja1n63cnc5v8wdzr8q7kh";
};
strictDeps = true;

1
pkgs/development/coq-modules/mathcomp-analysis/default.nix
View File

@ -22,6 +22,7 @@ with lib; mkCoqDerivation {
meta = {
description = "Analysis library compatible with Mathematical Components";
maintainers = [ maintainers.cohencyril ];
license = licenses.cecill-c;
};
}

340
pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch Normal file
View File

@ -0,0 +1,340 @@
From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Thu, 14 Jan 2021 00:32:00 -0800
Subject: [PATCH] meson: patch in an install prefix for building on nix
Used in the nixpkgs version of libvirt so that we can install things in
the nix store, but read them from the root filesystem.
---
meson.build | 9 +++++++++
meson_options.txt | 2 ++
src/libxl/meson.build | 6 +++---
src/locking/meson.build | 8 ++++----
src/lxc/meson.build | 6 +++---
src/meson.build | 18 +++++++++---------
src/network/meson.build | 12 ++++++------
src/nwfilter/xml/meson.build | 2 +-
src/qemu/meson.build | 14 +++++++-------
src/remote/meson.build | 6 +++---
src/security/apparmor/meson.build | 8 ++++----
tools/meson.build | 4 ++--
12 files changed, 53 insertions(+), 42 deletions(-)
diff --git a/meson.build b/meson.build
index 2e57a435df..4a72902a63 100644
--- a/meson.build
+++ b/meson.build
@@ -39,6 +39,8 @@ if host_machine.system() == 'windows'
conf.set('WINVER', '0x0600') # Win Vista / Server 2008
endif
+# patched in for nix
+install_prefix = get_option('install_prefix')
# set various paths
@@ -57,6 +59,13 @@ else
sysconfdir = prefix / get_option('sysconfdir')
endif
+# nix: don't prefix the localstatedir; some things need to write to it, so it
+# can't be in the nix store, and that's what the prefix is.
+# We'll prefix things ourselves where needed
+localstatedir = get_option('localstatedir')
+# Same for sysconfidr
+sysconfdir = get_option('sysconfdir')
+
# if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for
# sysconfdir as this makes a lot of things break in testing situations
if prefix == '/usr'
diff --git a/meson_options.txt b/meson_options.txt
index 74de064384..0a21eb845e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,5 @@
+option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation')
+
option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update')
option('packager', type: 'string', value: '', description: 'Extra packager name')
option('packager_version', type: 'string', value: '', description: 'Extra packager version')
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 3bb6cc5f2e..78d7be0ace 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL')
}
virt_install_dirs += [
- localstatedir / 'lib' / 'libvirt' / 'libxl',
- runstatedir / 'libvirt' / 'libxl',
- localstatedir / 'log' / 'libvirt' / 'libxl',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl',
+ install_prefix + runstatedir / 'libvirt' / 'libxl',
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl',
]
endif
diff --git a/src/locking/meson.build b/src/locking/meson.build
index 8a28310e40..9da81cc574 100644
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD')
}
virt_install_dirs += [
- localstatedir / 'lib' / 'libvirt' / 'lockd',
- localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files',
- runstatedir / 'libvirt' / 'lockd',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files',
+ install_prefix + runstatedir / 'libvirt' / 'lockd',
]
if conf.has('WITH_SANLOCK')
virt_install_dirs += [
- localstatedir / 'lib' / 'libvirt' / 'sanlock',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock',
]
endif
endif
diff --git a/src/lxc/meson.build b/src/lxc/meson.build
index f8e2a8852a..96d6687c5d 100644
--- a/src/lxc/meson.build
+++ b/src/lxc/meson.build
@@ -182,8 +182,8 @@ if conf.has('WITH_LXC')
}
virt_install_dirs += [
- localstatedir / 'lib' / 'libvirt' / 'lxc',
- runstatedir / 'libvirt' / 'lxc',
- localstatedir / 'log' / 'libvirt' / 'lxc',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc',
+ install_prefix + runstatedir / 'libvirt' / 'lxc',
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc',
]
endif
diff --git a/src/meson.build b/src/meson.build
index 29c8210ab2..bc960e0b69 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -669,7 +669,7 @@ endforeach
virt_conf_files += 'libvirt.conf'
-install_data(virt_conf_files, install_dir: confdir)
+install_data(virt_conf_files, install_dir: install_prefix + confdir)
install_data(virt_aug_files, install_dir: virt_aug_dir)
# augeas_test_data:
@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs
output: '@0@.conf'.format(data['name']),
configuration: daemon_conf,
install: true,
- install_dir: confdir,
+ install_dir: install_prefix + confdir,
)
if data.get('with_ip', false)
@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD')
install_data(
init_file,
- install_dir: sysconfdir / 'init.d',
+ install_dir: install_prefix + sysconfdir / 'init.d',
rename: [ init['name'] ],
)
if init.has_key('confd')
install_data(
init['confd'],
- install_dir: sysconfdir / 'conf.d',
+ install_dir: install_prefix + sysconfdir / 'conf.d',
rename: [ init['name'] ],
)
endif
@@ -872,7 +872,7 @@ if init_script != 'none'
foreach sysconf : sysconf_files
install_data(
sysconf['file'],
- install_dir: sysconfdir / 'sysconfig',
+ install_dir: install_prefix + sysconfdir / 'sysconfig',
rename: [ sysconf['name'] ],
)
endforeach
@@ -897,10 +897,10 @@ endif
# Install empty directories
virt_install_dirs += [
- localstatedir / 'cache' / 'libvirt',
- localstatedir / 'lib' / 'libvirt' / 'images',
- localstatedir / 'lib' / 'libvirt' / 'filesystems',
- localstatedir / 'lib' / 'libvirt' / 'boot',
+ install_prefix + localstatedir / 'cache' / 'libvirt',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'images',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot',
]
meson.add_install_script(
diff --git a/src/network/meson.build b/src/network/meson.build
index 13dd2c26b2..1be020081f 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK')
}
virt_install_dirs += [
- localstatedir / 'lib' / 'libvirt' / 'network',
- localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
- runstatedir / 'libvirt' / 'network',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
+ install_prefix + runstatedir / 'libvirt' / 'network',
]
uuidgen_prog = find_program('uuidgen', required: false)
@@ -98,7 +98,7 @@ if conf.has('WITH_NETWORK')
],
capture: true,
install: true,
- install_dir: confdir / 'qemu' / 'networks',
+ install_dir: install_prefix + confdir / 'qemu' / 'networks',
)
else
configure_file(
@@ -106,13 +106,13 @@ if conf.has('WITH_NETWORK')
output: '@BASENAME@',
copy: true,
install: true,
- install_dir: confdir / 'qemu' / 'networks',
+ install_dir: install_prefix + confdir / 'qemu' / 'networks',
)
endif
meson.add_install_script(
meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(),
- confdir / 'qemu' / 'networks' / 'autostart',
+ install_prefix + confdir / 'qemu' / 'networks' / 'autostart',
'../default.xml', 'default.xml',
)
diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build
index 95af75bb15..7fe99076f4 100644
--- a/src/nwfilter/xml/meson.build
+++ b/src/nwfilter/xml/meson.build
@@ -19,4 +19,4 @@ nwfilter_xml_files = [
'qemu-announce-self.xml',
]
-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter')
+install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter')
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 4e599d1e69..ba558d78f8 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU')
}
virt_install_dirs += [
- localstatedir / 'lib' / 'libvirt' / 'qemu',
- runstatedir / 'libvirt' / 'qemu',
- localstatedir / 'cache' / 'libvirt' / 'qemu',
- localstatedir / 'log' / 'libvirt' / 'qemu',
- localstatedir / 'lib' / 'libvirt' / 'swtpm',
- runstatedir / 'libvirt' / 'qemu' / 'swtpm',
- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu',
+ install_prefix + runstatedir / 'libvirt' / 'qemu',
+ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu',
+ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu',
+ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm',
+ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm',
+ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
]
endif
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 9ad2f6ab1c..429a15b326 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE')
}
virt_install_dirs += [
- localstatedir / 'log' / 'libvirt',
+ install_prefix + localstatedir / 'log' / 'libvirt',
]
logrotate_conf = configuration_data()
@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE')
)
install_data(
log_file,
- install_dir: sysconfdir / 'logrotate.d',
+ install_dir: install_prefix + sysconfdir / 'logrotate.d',
rename: [ name ],
)
endforeach
@@ -309,7 +309,7 @@ endif
if conf.has('WITH_SASL')
install_data(
'libvirtd.sasl',
- install_dir: sysconfdir / 'sasl2',
+ install_dir: install_prefix + sysconfdir / 'sasl2',
rename: [ 'libvirt.conf' ],
)
endif
diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build
index af43780211..e2d6c812f8 100644
--- a/src/security/apparmor/meson.build
+++ b/src/security/apparmor/meson.build
@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles
output: name,
configuration: apparmor_gen_profiles_conf,
install: true,
- install_dir: apparmor_dir,
+ install_dir: install_prefix + apparmor_dir,
)
endforeach
install_data(
[ 'libvirt-qemu', 'libvirt-lxc' ],
- install_dir: apparmor_dir / 'abstractions',
+ install_dir: install_prefix + apparmor_dir / 'abstractions',
)
install_data(
[ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ],
- install_dir: apparmor_dir / 'libvirt',
+ install_dir: install_prefix + apparmor_dir / 'libvirt',
)
install_data(
'usr.lib.libvirt.virt-aa-helper.local',
- install_dir: apparmor_dir / 'local',
+ install_dir: install_prefix + apparmor_dir / 'local',
rename: 'usr.lib.libvirt.virt-aa-helper',
)
diff --git a/tools/meson.build b/tools/meson.build
index b8c6802f0a..dacd0ff1ce 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL')
install_rpath: libvirt_rpath,
)
- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt')
+ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt')
endif
if host_machine.system() == 'windows'
@@ -274,7 +274,7 @@ configure_file(
if init_script == 'systemd'
install_data(
'libvirt-guests.sysconf',
- install_dir: sysconfdir / 'sysconfig',
+ install_dir: install_prefix + sysconfdir / 'sysconfig',
rename: 'libvirt-guests',
)
--
2.29.2

110
pkgs/development/libraries/libvirt/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, fetchgit
, pkgconfig, makeWrapper, autoreconfHook, fetchpatch
, makeWrapper, autoreconfHook, fetchpatch
, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils
, iproute, iptables, readline, lvm2, util-linux, systemd, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, iproute, readline, lvm2, util-linux, systemd, libpciaccess, gettext
, libtasn1, iptables-nftables-compat, libgcrypt, yajl, pmutils, libcap_ng, libapparmor
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, dbus, libtirpc, rpcsvc-proto, darwin
, meson, ninja, audit, cmake, bash-completion, pkg-config
, enableXen ? false, xen ? null
, enableIscsi ? false, openiscsi
, enableCeph ? false, ceph
@ -17,26 +18,28 @@ let
buildFromTarball = stdenv.isDarwin;
in stdenv.mkDerivation rec {
pname = "libvirt";
version = "6.6.0";
version = "6.8.0";
src =
if buildFromTarball then
fetchurl {
url = "https://libvirt.org/sources/${pname}-${version}.tar.xz";
sha256 = "1y8y13zvh820f4b15287wb77wq7ra7kbfnpblzhm1dki5pfjvrcl";
sha256 = "0hhk2r0dnm9zmfwmnsnmnacm4pik6z60llp22axx7kcpqxv98nv5";
}
else
fetchgit {
url = "https://gitlab.com/libvirt/libvirt.git";
rev = "v${version}";
sha256 = "09hsbm2qmx0jfmm418rf5lx374g85bwgg0kzlga62x5180jhsssn";
sha256 = "sha256-BQZPdmDE0g7xWd6QOHMKosP2HgVpIjsfgfohA9VxEHs=";
fetchSubmodules = true;
};
patches = [
./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch
];
nativeBuildInputs = [
makeWrapper pkgconfig docutils
] ++ optionals (!buildFromTarball) [
autoreconfHook
ninja meson cmake makeWrapper pkg-config docutils
] ++ optional (!stdenv.isDarwin) [
rpcsvc-proto
] ++ optionals stdenv.isDarwin [
@ -44,10 +47,11 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
bash-completion pkg-config
libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl
libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib dbus
] ++ optionals stdenv.isLinux [
libpciaccess lvm2 util-linux systemd libnl numad zfs
audit libpciaccess lvm2 util-linux systemd libnl numad zfs
libapparmor libcap_ng numactl attr parted libtirpc
] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [
xen
@ -59,62 +63,60 @@ in stdenv.mkDerivation rec {
libiconv gmp
];
preConfigure = ''
PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables ebtables lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
preConfigure = let
overrides = {
QEMU_BRIDGE_HELPER = "/run/wrappers/bin/qemu-bridge-helper";
QEMU_PR_HELPER = "/run/libvirt/nix-helpers/qemu-pr-helper";
};
patchBuilder = var: value: ''
sed -i meson.build -e "s|conf.set_quoted('${var}',.*|conf.set_quoted('${var}','${value}')|"
'';
in ''
PATH=${stdenv.lib.makeBinPath ([ dnsmasq ] ++ optionals stdenv.isLinux [ iproute iptables-nftables-compat lvm2 systemd numad ] ++ optionals enableIscsi [ openiscsi ])}:$PATH
# the path to qemu-kvm will be stored in VM's .xml and .save files
# do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations
substituteInPlace src/lxc/lxc_conf.c \
--replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",'
patchShebangs . # fixes /usr/bin/python references
mkdir -p build && cd build
'';
''
+ (stdenv.lib.concatStringsSep "\n" (stdenv.lib.mapAttrsToList patchBuilder overrides));
configureScript = "../configure";
mesonAutoFeatures = "auto";
dontAddDisableDepTrack = true;
configureFlags = [
"--with-runstatedir=/run" # TODO: remove when autoconf 2.70 is released
"--localstatedir=/var"
mesonFlags = let
opt = option: enable: "-D${option}=${if enable then "enabled" else "disabled"}";
in [
"--sysconfdir=/var/lib"
"--with-libpcap"
"--with-qemu"
"--with-vmware"
"--with-vbox"
"--with-test"
"--with-esx"
"--with-remote"
"--with-polkit"
"-Dinstall_prefix=${placeholder "out"}"
"-Dlocalstatedir=/var/lib"
"-Drunstatedir=/var/run"
"-Dlibpcap=enabled"
"-Ddriver_qemu=enabled"
"-Ddriver_vmware=enabled"
"-Ddriver_vbox=enabled"
"-Ddriver_test=enabled"
"-Ddriver_esx=enabled"
"-Ddriver_remote=enabled"
"-Dpolkit=enabled"
"-Ddbus=enabled"
(opt "storage_iscsi" enableIscsi)
] ++ optionals stdenv.isLinux [
"QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
"QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
"EBTABLES_PATH=${ebtables}/bin/ebtables-legacy"
"CFLAGS=-I${libtirpc.dev}/include/tirpc"
"--with-attr"
"--with-apparmor"
"--with-secdriver-apparmor"
"--with-numad"
"--with-macvtap"
"--with-virtualport"
"--with-storage-disk"
] ++ optionals (stdenv.isLinux && zfs != null) [
"--with-storage-zfs"
] ++ optionals enableIscsi [
"--with-storage-iscsi"
] ++ optionals enableCeph [
"--with-storage-rbd"
(opt "storage_zfs" (zfs != null))
"-Dattr=enabled"
"-Dapparmor=enabled"
"-Dsecdriver_apparmor=enabled"
"-Dnumad=enabled"
"-Dmacvtap=enabled"
"-Dvirtualport=enabled"
"-Dstorage_disk=enabled"
(opt "storage_rbd" enableCeph)
] ++ optionals stdenv.isDarwin [
"--with-init-script=none"
];
installFlags = [
"runstatedir=${placeholder "out"}/run"
"localstatedir=$(TMPDIR)/var"
"sysconfdir=$(out)/var/lib"
"-Dinit_script=none"
];
postInstall = let
binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ];
# iptables-nftables-compat for an 'ebtables' binary
binPath = [ iptables-nftables-compat iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ] ++ optionals enableIscsi [ openiscsi ];
in ''
substituteInPlace $out/libexec/libvirt-guests.sh \
--replace 'ON_BOOT=start' 'ON_BOOT=''${ON_BOOT:-start}' \
@ -132,8 +134,6 @@ in stdenv.mkDerivation rec {
--prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath}
'';
enableParallelBuilding = true;
meta = {
homepage = "https://libvirt.org/";
repositories.git = "git://libvirt.org/libvirt.git";

25
pkgs/development/lisp-modules/quicklisp-to-nix-output/clfswm.nix Normal file
View File

@ -0,0 +1,25 @@
args @ { fetchurl, ... }:
rec {
baseName = ''clfswm'';
version = ''20161204-git'';
description = ''CLFSWM: Fullscreen Window Manager'';
deps = [ args."clx" ];
src = fetchurl {
url = ''http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz'';
sha256 = ''1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73'';
};
packageName = "clfswm";
asdFilesToKeep = ["clfswm.asd"];
overrides = x: x;
}
/* (SYSTEM clfswm DESCRIPTION CLFSWM: Fullscreen Window Manager SHA256
1jgz127721dgcv3qm1knc335gy04vzh9gl0hshp256rxi82cpp73 URL
http://beta.quicklisp.org/archive/clfswm/2016-12-04/clfswm-20161204-git.tgz
MD5 dc976785ef899837ab0fc50a4ed6b740 NAME clfswm FILENAME clfswm DEPS
((NAME clx FILENAME clx)) DEPENDENCIES (clx) VERSION 20161204-git SIBLINGS
NIL PARASITES NIL) */

10
pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
View File

@ -231,4 +231,14 @@ $out/lib/common-lisp/query-fs"
cl-cffi-gtk-gdk = addNativeLibs [pkgs.gtk3];
cl-cffi-gtk-gtk3 = addNativeLibs [pkgs.gtk3];
cl-webkit2 = addNativeLibs [pkgs.webkitgtk];
clfswm = x: {
overrides = y: (x.overrides y) // {
postInstall = ''
export NIX_LISP_PRELAUNCH_HOOK="nix_lisp_build_system clfswm '(function clfswm:main)'"
"$out/bin/clfswm-lisp-launcher.sh"
cp "$out/lib/common-lisp/clfswm/clfswm" "$out/bin"
'';
};
};
}

1
pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
View File

@ -82,6 +82,7 @@ cl-utilities
cl-vectors
cl-webkit2
cl-who
clfswm
clx
collectors
command-line-arguments

7
pkgs/development/lisp-modules/quicklisp-to-nix.nix
View File

@ -2848,6 +2848,13 @@ let quicklisp-to-nix-packages = rec {
"fiasco" = quicklisp-to-nix-packages."fiasco";
}));
"clfswm" = buildLispPackage
((f: x: (x // (f x)))
(qlOverrides."clfswm" or (x: {}))
(import ./quicklisp-to-nix-output/clfswm.nix {
inherit fetchurl;
"clx" = quicklisp-to-nix-packages."clx";
}));
"cl-who" = buildLispPackage
((f: x: (x // (f x)))

4
pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix
View File

@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "azure-mgmt-recoveryservicesbackup";
version = "0.10.0";
version = "0.11.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "2debf30be50d5bb85acf4f73a2e57e11c814ead04e58f52279e5ef0a2df71d4f";
sha256 = "f2b85d1d7d7db2af106000910ea5f8b95639874176a5de2f7ab37a2caa67af6b";
};
propagatedBuildInputs = [

36
pkgs/development/python-modules/cert-chain-resolver/default.nix Normal file
View File

@ -0,0 +1,36 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, pytestCheckHook
, pytest-mock
, cryptography
}:
buildPythonPackage rec {
pname = "cert-chain-resolver";
version = "1.0.1";
src = fetchFromGitHub {
owner = "rkoopmans";
repo = "python-certificate-chain-resolver";
rev = version;
sha256 = "1kmig4ksbx1wvgcjn4r9jjg2pn1ag5rq871bjwxkp9kslb3x3d1l";
};
propagatedBuildInputs = [ cryptography ];
checkInputs = [ pytestCheckHook pytest-mock ];
# online tests
disabledTests = [
"test_cert_returns_completed_chain"
"test_display_flag_is_properly_formatted"
];
meta = with lib; {
homepage = "https://github.com/rkoopmans/python-certificate-chain-resolver";
description = "Resolve / obtain the certificate intermediates of a x509 certificate";
license = licenses.mit;
maintainers = with maintainers; [ veehaitch ];
};
}

18
pkgs/development/python-modules/colorlog/default.nix
View File

@ -1,21 +1,19 @@
{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
{ lib
, buildPythonPackage
, fetchPypi
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "colorlog";
version = "4.6.2";
version = "4.7.2";
src = fetchPypi {
inherit pname version;
sha256 = "54e5f153419c22afc283c130c4201db19a3dbd83221a0f4657d5ee66234a2ea4";
sha256 = "0lc2r105hxbyh29dsgczdi379lh57gnbj56jsxi5g9rqcihmpl0q";
};
checkInputs = [ pytest ];
# tests are no longer packaged in pypi
doCheck = false;
checkPhase = ''
py.test -p no:logging
'';
checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "colorlog" ];

4
pkgs/development/python-modules/libvirt/default.nix
View File

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "libvirt";
version = "6.6.0";
version = "6.8.0";
src = assert version == libvirt.version; fetchFromGitLab {
owner = "libvirt";
repo = "libvirt-python";
rev = "v${version}";
sha256 = "0jj6b2nlx7qldwbvixz74abn3p0sq4lkf6ak74vynrv5xvlycb9v";
sha256 = "sha256-A3eRfzQAfubyPefDlq5bAiFJ/G90D2JKdJO2Em0wE00=";
};
nativeBuildInputs = [ pkgconfig ];

30
pkgs/development/python-modules/requests-oauthlib/default.nix
View File

@ -1,21 +1,43 @@
{ lib, stdenv, buildPythonPackage, fetchPypi
, oauthlib, requests }:
{ lib
, buildPythonPackage
, fetchPypi
, mock
, oauthlib
, pytestCheckHook
, requests
, requests-mock
}:
buildPythonPackage rec {
version = "1.3.0";
pname = "requests-oauthlib";
version = "1.3.0";
src = fetchPypi {
inherit pname version;
sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml";
};
doCheck = false; # Internet tests fail when building in chroot
propagatedBuildInputs = [ oauthlib requests ];
checkInputs = [
mock
pytestCheckHook
requests-mock
];
# Exclude tests which require network access
disabledTests = [
"testCanPostBinaryData"
"test_content_type_override"
"test_url_is_native_str"
];
pythonImportsCheck = [ "requests_oauthlib" ];
meta = with lib; {
description = "OAuthlib authentication support for Requests";
homepage = "https://github.com/requests/requests-oauthlib";
license = with licenses; [ isc ];
maintainers = with maintainers; [ prikhi ];
};
}

30
pkgs/development/python-modules/tmb/default.nix Normal file
View File

@ -0,0 +1,30 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, requests
}:
buildPythonPackage rec {
pname = "tmb";
version = "0.1.0";
src = fetchFromGitHub {
owner = "alemuro";
repo = pname;
rev = version;
sha256 = "0fmwm9dz2mik9zni50wrnw7k9ld4l4w3p92aws6jcrdfxfi7aq7p";
};
propagatedBuildInputs = [ requests ];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "tmb" ];
meta = with lib; {
homepage = "https://github.com/alemuro/tmb";
description = "Python library that interacts with TMB API";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}

35
pkgs/development/python-modules/ydiff/default.nix
View File

@ -1,4 +1,6 @@
{ lib, stdenv, buildPythonPackage, fetchPypi }:
{ stdenv, lib, buildPythonPackage, fetchPypi, docutils, pygments
, gitMinimal, mercurial, subversion, patchutils, less
}:
buildPythonPackage rec {
pname = "ydiff";
@ -9,21 +11,38 @@ buildPythonPackage rec {
sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121";
};
# test suite requires a multitude of other version control tooling
# currently only a single file, an import/usage should suffice
patchPhase = ''
substituteInPlace ydiff.py \
--replace "['git'" "['${gitMinimal}/bin/git'" \
--replace "['hg'" "['${mercurial}/bin/hg'" \
--replace "['svn'" "['${subversion}/bin/svn'" \
--replace "['filterdiff'" "['${patchutils}/bin/filterdiff'" \
--replace "['less'" "['${less}/bin/less'" # doesn't support PAGER from env
substituteInPlace tests/test_ydiff.py \
--replace /bin/rm rm \
--replace /bin/sh sh
patchShebangs setup.py
patchShebangs tests/*.sh
'';
checkInputs = [ docutils pygments ];
checkPhase = ''
$out/bin/ydiff --help
runHook preCheck
make doc-check reg # We don't want the linter or coverage check.
runHook postCheck
'';
meta = with lib; {
description = "View colored, incremental diff in workspace or from stdin with side by side and auto pager support (Was \"cdiff\")";
longDescription = ''
Term based tool to view colored, incremental diff in a Git/Mercurial/Svn
workspace or from stdin, with side by side (similar to diff -y) and auto
pager support
Term based tool to view colored, incremental diff in a version
controlled workspace (supports Git, Mercurial, Perforce and Svn
so far) or from stdin, with side by side (similar to diff -y)
and auto pager support.
'';
homepage = "https://github.com/ymattw/ydiff";
license = licenses.bsd3;
maintainers = teams.deshaw.members;
maintainers = (with maintainers; [ leenaars ]) ++ teams.deshaw.members;
};
}

45
pkgs/development/tools/ydiff/default.nix
View File

@ -1,45 +0,0 @@
{ stdenv, lib, pythonPackages, python3Packages, less, patchutils, git
, subversion, coreutils, which }:
with pythonPackages;
buildPythonApplication rec {
pname = "ydiff";
version = "1.2";
src = fetchPypi {
inherit pname version;
sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121";
};
patchPhase = ''
substituteInPlace tests/test_ydiff.py \
--replace /bin/rm ${coreutils}/bin/rm \
--replace /bin/sh ${stdenv.shell}
substituteInPlace Makefile \
--replace "pep8 --ignore" "# pep8 --ignore" \
--replace "python3 \`which coverage\`" "${python3Packages.coverage}/bin/coverage3" \
--replace /bin/sh ${stdenv.shell} \
--replace tests/regression.sh "${stdenv.shell} tests/regression.sh"
patchShebangs tests/*.sh
'';
buildInputs = [ docutils pygments ];
propagatedBuildInputs = [ less patchutils ];
checkInputs = [ coverage coreutils git subversion which ];
checkTarget = if isPy3k then "test3" else "test";
meta = {
homepage = "https://github.com/ymattw/ydiff";
description = "View colored, incremental diff in workspace or from stdin";
longDescription = ''
Term based tool to view colored, incremental diff in a version
controlled workspace (supports Git, Mercurial, Perforce and Svn
so far) or from stdin, with side by side (similar to diff -y)
and auto pager support.
'';
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ leenaars ];
};
}

24
pkgs/games/factorio/versions.json
View File

@ -2,12 +2,12 @@
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.8.tar.xz",
"name": "factorio_alpha_x64-1.1.10.tar.xz",
"needsAuth": true,
"sha256": "1zvjmdmvp05yr8lln4hsa184hl115sv9xz1dwxa3cb827f5ndd6m",
"sha256": "1vz0av669l6li87sld59v1yjlfxkzwdprbh152wnaym7sgszp3lq",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.8/alpha/linux64",
"version": "1.1.8"
"url": "https://factorio.com/get-download/1.1.10/alpha/linux64",
"version": "1.1.10"
},
"stable": {
"name": "factorio_alpha_x64-1.0.0.tar.xz",
@ -20,12 +20,12 @@
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.0.0.tar.xz",
"name": "factorio_demo_x64-1.1.10.tar.xz",
"needsAuth": false,
"sha256": "0h9cqbp143w47zcl4qg4skns4cngq0k40s5jwbk0wi5asjz8whqn",
"sha256": "151crxb5xihj9fygf5n335g342mjmqi9fs1nblx6nspk2s4firwm",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.0.0/demo/linux64",
"version": "1.0.0"
"url": "https://factorio.com/get-download/1.1.10/demo/linux64",
"version": "1.1.10"
},
"stable": {
"name": "factorio_demo_x64-1.0.0.tar.xz",
@ -38,12 +38,12 @@
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.8.tar.xz",
"name": "factorio_headless_x64-1.1.10.tar.xz",
"needsAuth": false,
"sha256": "1j2nmm61c99qis8fkc1gp5i3fj3vmc2mfds7lw4gfr9kr956cjhf",
"sha256": "1132spanr8w71v6y6ynd9ciy22nk60mz4vdaxgdnwmjd8yfbg1d7",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.8/headless/linux64",
"version": "1.1.8"
"url": "https://factorio.com/get-download/1.1.10/headless/linux64",
"version": "1.1.10"
},
"stable": {
"name": "factorio_headless_x64-1.0.0.tar.xz",

31
pkgs/games/fish-fillets-ng/default.nix
View File

@ -1,7 +1,9 @@
{stdenv, fetchurl, SDL, lua5_1, pkgconfig, SDL_mixer, SDL_image, SDL_ttf}:
{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, lua5_1, pkg-config, SDL_mixer, SDL_image, SDL_ttf }:
stdenv.mkDerivation rec {
pname = "fish-fillets-ng";
version = "1.0.1";
src = fetchurl {
url = "mirror://sourceforge/fillets/fillets-ng-${version}.tar.gz";
sha256 = "1nljp75aqqb35qq3x7abhs2kp69vjcj0h1vxcpdyn2yn2nalv6ij";
@ -10,18 +12,31 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/fillets/fillets-ng-data-${version}.tar.gz";
sha256 = "169p0yqh2gxvhdilvjc2ld8aap7lv2nhkhkg4i1hlmgc6pxpkjgh";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config copyDesktopItems ];
buildInputs = [ SDL lua5_1 SDL_mixer SDL_image SDL_ttf ];
desktopItems = [ (makeDesktopItem {
name = "fish-fillets-ng";
exec = "fillets";
icon = "fish-fillets-ng";
desktopName = "Fish Fillets";
comment = "Puzzle game about witty fish saving the world sokoban-style";
categories = "Game;LogicGame;";
}) ];
postInstall = ''
mkdir -p "$out/share/games/fillets-ng/"
tar -xf ${data} -C "$out/share/games/fillets-ng/" --strip-components=1
mkdir -p $out/share/games/fillets-ng
tar -xf ${data} -C $out/share/games/fillets-ng --strip-components=1
install -Dm644 ${./icon.xpm} $out/share/pixmaps/fish-fillets-ng.xpm
'';
meta = {
meta = with lib; {
inherit version;
description = ''A puzzle game'';
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
homepage = "http://fillets.sourceforge.net/";
};
}

39
pkgs/games/fish-fillets-ng/icon.xpm Normal file
View File

@ -0,0 +1,39 @@
/* XPM */
static char * fillets_ng_xpm[] = {
"32 32 4 1",
" c None",
". c #000000",
"+ c #808000",
"@ c #FFFF00",
" .......... ",
" ...+@@@@@@+... ",
" ...@@@@@@@@@@@@... ",
" ..+@@@+......+@@@+.. ",
" ..@@@+..........+@@@.. ",
" ..@@@..............@@@.. ",
" ..@@@................@@@.. ",
" ..@@@..................@@@.. ",
" .+@@....................@@+. ",
" ..@@......................@@.. ",
" .@@+......................+@@. ",
"..@@.....@@@@@.........@@...@@..",
".+@+...@@@@@@@@@.....@@@@...+@+.",
".@@...@@@.....@@@...@@+@@....@@.",
".@@...@@.+@....+@@+@@+.@@....@@.",
".@@..@@..@@.....+@@@+..@@....@@.",
".@@..@@.........+@@@+..@@....@@.",
".@@...@@.......+@@+@@+.@@....@@.",
".@@...@@@.....@@@...@@+@@....@@.",
".+@+...@@@@@@@@@.....@@@@...+@+.",
"..@@.....@@@@@.........@@...@@..",
" .@@+......................+@@. ",
" ..@@......................@@.. ",
" .+@@....................@@+. ",
" ..@@@..................@@@.. ",
" ..@@@................@@@.. ",
" ..@@@..............@@@.. ",
" ..@@@+..........+@@@.. ",
" ..+@@@+......+@@@+.. ",
" ...@@@@@@@@@@@@... ",
" ...+@@@@@@+... ",
" .......... "};

113
pkgs/misc/vscode-extensions/default.nix
View File

@ -99,6 +99,23 @@ let
};
};
CoenraadS.bracket-pair-colorizer = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/CoenraadS.bracket-pair-colorizer/changelog";
description = "A customizable extension for colorizing matching brackets";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer";
homepage = "https://github.com/CoenraadS/BracketPair";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
mktplcRef = {
name = "bracket-pair-colorizer";
publisher = "CoenraadS";
version = "1.0.61";
sha256 = "0r3bfp8kvhf9zpbiil7acx7zain26grk133f0r0syxqgml12i652";
};
};
coenraads.bracket-pair-colorizer-2 = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "bracket-pair-colorizer-2";
@ -131,6 +148,57 @@ let
meta = { license = stdenv.lib.licenses.mit; };
};
donjayamanne.githistory = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/donjayamanne.githistory/changelog";
description = "View git log, file history, compare branches or commits";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory";
homepage = "https://github.com/DonJayamanne/gitHistoryVSCode/";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
mktplcRef = {
name = "githistory";
publisher = "donjayamanne";
version = "0.6.14";
sha256 = "11x116hzqnhgbryp2kqpki1z5mlnwxb0ly9r1513m5vgbisrsn0i";
};
};
esbenp.prettier-vscode = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/esbenp.prettier-vscode/changelog";
description = "Code formatter using prettier";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode";
homepage = "https://github.com/prettier/prettier-vscode";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
mktplcRef = {
name = "prettier-vscode";
publisher = "esbenp";
version = "5.8.0";
sha256 = "0h7wc4pffyq1i8vpj4a5az02g2x04y7y1chilmcfmzg2w42xpby7";
};
};
file-icons.file-icons = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog";
description = "File-specific icons in VSCode for improved visual grepping.";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=file-icons.file-icons";
homepage = "https://github.com/file-icons/vscode";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
mktplcRef = {
name = "file-icons";
publisher = "file-icons";
version = "1.0.28";
sha256 = "1lyx0l42xhi2f3rdnjddc3mw7m913kjnchawi98i6vqsx3dv7091";
};
};
formulahendry.auto-close-tag = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "auto-close-tag";
@ -155,6 +223,23 @@ let
};
};
freebroccolo.reasonml = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/freebroccolo.reasonml/changelog";
description = "Reason support for Visual Studio Code";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=freebroccolo.reasonml";
homepage = "https://github.com/reasonml-editor/vscode-reasonml";
license = licenses.asl20;
maintainers = with maintainers; [ superherointj ];
};
mktplcRef = {
name = "reasonml";
publisher = "freebroccolo";
version = "1.0.38";
sha256 = "1nay6qs9vcxd85ra4bv93gg3aqg3r2wmcnqmcsy9n8pg1ds1vngd";
};
};
github.github-vscode-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "github-vscode-theme";
@ -220,15 +305,20 @@ let
};
jnoortheen.nix-ide = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog";
description = "Nix language support with formatting and error report";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=jnoortheen.nix-ide";
homepage = "https://github.com/jnoortheen/vscode-nix-ide";
license = licenses.mit;
maintainers = with maintainers; [ superherointj ];
};
mktplcRef = {
name = "nix-ide";
publisher = "jnoortheen";
version = "0.1.7";
sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm";
};
meta = {
license = stdenv.lib.licenses.mit;
};
};
justusadam.language-haskell = buildVscodeMarketplaceExtension {
@ -325,6 +415,23 @@ let
matklad.rust-analyzer = callPackage ./rust-analyzer {};
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
meta = with lib; {
changelog = "https://marketplace.visualstudio.com/items/ocamllabs.ocaml-platform/changelog";
description = "Official OCaml Support from OCamlLabs";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=ocamllabs.ocaml-platform";
homepage = "https://github.com/ocamllabs/vscode-ocaml-platform";
license = licenses.isc;
maintainers = with maintainers; [ superherointj ];
};
mktplcRef = {
name = "ocaml-platform";
publisher = "ocamllabs";
version = "1.5.1";
sha256 = "0jkxpcrbr8xmwfl8jphmarjz2jk54hvmc24ww89d4bgx1awayqfh";
};
};
pkief.material-icon-theme = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "material-icon-theme";

2
pkgs/servers/home-assistant/component-packages.nix
View File

@ -841,7 +841,7 @@
"tile" = ps: with ps; [ pytile ];
"time_date" = ps: with ps; [ ];
"timer" = ps: with ps; [ ];
"tmb" = ps: with ps; [ ]; # missing inputs: tmb
"tmb" = ps: with ps; [ tmb ];
"tod" = ps: with ps; [ ];
"todoist" = ps: with ps; [ todoist ];
"tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2

1
pkgs/servers/slimserver/default.nix
View File

@ -44,6 +44,7 @@ perlPackages.buildPerlPackage rec {
perlPackages.LogLog4perl
perlPackages.LWP
perlPackages.NetHTTP
perlPackages.NetHTTPSNB
perlPackages.ProcBackground
perlPackages.SubName
perlPackages.TemplateToolkit

17
pkgs/tools/archivers/p7zip/default.nix
View File

@ -1,21 +1,15 @@
{ stdenv, fetchFromGitHub, lib, enableUnfree ? false }:
{ stdenv, fetchFromGitHub, fetchpatch, lib, enableUnfree ? false }:
stdenv.mkDerivation rec {
pname = "p7zip";
version = "17.01";
version = "17.03";
src = fetchFromGitHub {
owner = "szcnick";
repo = pname;
rev = "v${version}";
sha256 = "0gczdmypwbfnxzb11rjrrndjkkb3jzxfby2cchn5j8ysny13mfps";
}
;
patches = [
./gcc10.patch
];
sha256 = "0zgpa90z5p30jbpqydiig1h8hn41c76n2x26rh8cc92xw72ni33d";
};
# Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional
postPatch = ''
@ -35,8 +29,9 @@ stdenv.mkDerivation rec {
find . -name makefile'*' -exec sed -i '/Rar/d' {} +
'';
makeFlags = [ "DEST_HOME=${placeholder "out"}" ];
preConfigure = ''
makeFlagsArray=(DEST_HOME=$out)
buildFlags=all3
'' + stdenv.lib.optionalString stdenv.isDarwin ''
cp makefile.macosx_llvm_64bits makefile.machine

40
pkgs/tools/archivers/p7zip/gcc10.patch
View File

@ -1,40 +0,0 @@
From 1b7d2c73f01b2d2b6a3d2d16840e96e92afdcd61 Mon Sep 17 00:00:00 2001
From: jinfeihan57 <jinfeihan57@gmail.com>
Date: Tue, 9 Jun 2020 16:48:25 +0800
Subject: [PATCH] gix gcc10 compiler error
---
CPP/Windows/ErrorMsg.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/CPP/Windows/ErrorMsg.cpp b/CPP/Windows/ErrorMsg.cpp
index 99684ae..90a7e20 100644
--- a/CPP/Windows/ErrorMsg.cpp
+++ b/CPP/Windows/ErrorMsg.cpp
@@ -13,7 +13,7 @@ UString MyFormatMessage(DWORD errorCode)
const char * txt = 0;
AString msg;
- switch(errorCode) {
+ switch(HRESULT(errorCode)) {
case ERROR_NO_MORE_FILES : txt = "No more files"; break ;
case E_NOTIMPL : txt = "E_NOTIMPL"; break ;
case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ;
@@ -22,7 +22,7 @@ UString MyFormatMessage(DWORD errorCode)
case STG_E_INVALIDFUNCTION : txt = "STG_E_INVALIDFUNCTION"; break ;
case E_OUTOFMEMORY : txt = "E_OUTOFMEMORY"; break ;
case E_INVALIDARG : txt = "E_INVALIDARG"; break ;
- case ERROR_DIRECTORY : txt = "Error Directory"; break ;
+ case ERROR_DIRECTORY : txt = "Error Directory"; break ;
default:
txt = strerror(errorCode);
}
@@ -43,7 +43,7 @@ bool MyFormatMessage(DWORD messageID, CSysString &message)
const char * txt = 0;
AString msg;
- switch(messageID) {
+ switch(HRESULT(messageID)) {
case ERROR_NO_MORE_FILES : txt = "No more files"; break ;
case E_NOTIMPL : txt = "E_NOTIMPL"; break ;
case E_NOINTERFACE : txt = "E_NOINTERFACE"; break ;

6
pkgs/tools/filesystems/nixpart/0.4/blivet.nix
View File

@ -1,6 +1,6 @@
# FIXME: Unify with pkgs/development/python-modules/blivet/default.nix.
{ lib, stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
{ lib, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
, libselinux, cryptsetup, multipath_tools, lsof, util-linux
, useNixUdev ? true, systemd ? null
# useNixUdev is here for bw compatibility
@ -30,13 +30,13 @@ buildPythonApplication rec {
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${util-linux.bin}/bin/\1"|' blivet/util.py
sed -i -e '/find_library/,/find_library/ {
c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1"
c libudev = "${lib.getLib systemd}/lib/libudev.so.1"
}' blivet/pyudev.py
'';
propagatedBuildInputs = [
pykickstart pyparted pyblock libselinux cryptsetup
] ++ stdenv.lib.optional useNixUdev systemd;
] ++ lib.optional useNixUdev systemd;
# tests are currently _heavily_ broken upstream
doCheck = false;

14
pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libgcrypt, libuuid, pkgconfig, popt
, enablePython ? true, python ? null
}:
@ -22,17 +22,17 @@ stdenv.mkDerivation rec {
];
configureFlags = [ "--enable-cryptsetup-reencrypt" ]
++ stdenv.lib.optional enablePython "--enable-python";
++ lib.optional enablePython "--enable-python";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lvm2 libgcrypt libuuid popt ]
++ stdenv.lib.optional enablePython python;
++ lib.optional enablePython python;
meta = {
meta = with lib; {
homepage = "http://code.google.com/p/cryptsetup/";
description = "LUKS for dm-crypt";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ];
platforms = with stdenv.lib.platforms; linux;
license = licenses.gpl2;
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};
}

18
pkgs/tools/filesystems/nixpart/0.4/default.nix
View File

@ -10,46 +10,46 @@
let
blivet = import ./blivet.nix {
inherit stdenv fetchurl buildPythonApplication;
inherit lib fetchurl buildPythonApplication;
inherit pykickstart pyparted pyblock cryptsetup libselinux multipath_tools;
inherit useNixUdev;
inherit (pkgs) lsof util-linux systemd;
};
cryptsetup = import ./cryptsetup.nix {
inherit stdenv fetchurl python;
inherit lib stdenv fetchurl python;
inherit (pkgs) fetchpatch pkgconfig libgcrypt libuuid popt lvm2;
};
dmraid = import ./dmraid.nix {
inherit stdenv fetchurl lvm2;
inherit lib stdenv fetchurl lvm2;
};
lvm2 = import ./lvm2.nix {
inherit stdenv fetchurl;
inherit lib stdenv fetchurl;
inherit (pkgs) fetchpatch pkgconfig util-linux systemd coreutils;
};
multipath_tools = import ./multipath-tools.nix {
inherit stdenv fetchurl lvm2;
inherit lib stdenv fetchurl lvm2;
inherit (pkgs) fetchpatch readline systemd libaio gzip;
};
parted = import ./parted.nix {
inherit stdenv fetchurl;
inherit lib stdenv fetchurl;
inherit (pkgs) fetchpatch util-linux readline libuuid gettext check lvm2;
};
pyblock = import ./pyblock.nix {
inherit stdenv fetchurl python lvm2 dmraid;
inherit lib stdenv fetchurl python lvm2 dmraid;
};
pykickstart = import ./pykickstart.nix {
inherit stdenv fetchurl python buildPythonApplication urlgrabber;
inherit lib fetchurl python buildPythonApplication urlgrabber;
};
pyparted = import ./pyparted.nix {
inherit stdenv fetchurl python buildPythonApplication parted;
inherit lib stdenv fetchurl python buildPythonApplication parted;
inherit (pkgs) pkgconfig e2fsprogs;
};

8
pkgs/tools/filesystems/nixpart/0.4/dmraid.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lvm2 }:
{ lib, stdenv, fetchurl, lvm2 }:
stdenv.mkDerivation rec {
name = "dmraid-1.0.0.rc15";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ lvm2 ];
meta = {
meta = with lib; {
description = "Old-style RAID configuration utility";
longDescription = ''
Old RAID configuration utility (still under development, though).
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
its volumes. May be needed for rescuing an older system or nuking
the metadata when reformatting.
'';
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
maintainers = [ maintainers.raskin ];
platforms = platforms.linux;
};
}

6
pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, systemd, util-linux, coreutils }:
let
v = "2.02.106";
@ -68,9 +68,9 @@ stdenv.mkDerivation {
cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators
'';
meta = {
meta = with lib; {
homepage = "http://sourceware.org/lvm2/";
description = "Tools to support Logical Volume Management (LVM) on Linux";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
};
}

10
pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
View File

@ -1,6 +1,6 @@
# FIXME: unify with pkgs/os-specific/linux/multipath-tools/default.nix.
{ stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:
{ lib, stdenv, fetchurl, fetchpatch, lvm2, libaio, gzip, readline, systemd }:
stdenv.mkDerivation rec {
name = "multipath-tools-0.4.9";
@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id
substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id
substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id
substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${lib.getLib systemd}/lib/udev/scsi_id
sed -i -re '
s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
@ -45,9 +45,9 @@ stdenv.mkDerivation rec {
'';
meta = {
meta = with lib; {
description = "Tools for the Linux multipathing driver";
homepage = "http://christophe.varoqui.free.fr/";
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
};
}

18
pkgs/tools/filesystems/nixpart/0.4/parted.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
{ lib,stdenv, fetchurl, fetchpatch, lvm2, libuuid, gettext, readline
, util-linux, check
, enableStatic ? stdenv.hostPlatform.isStatic
}:
@ -21,21 +21,21 @@ stdenv.mkDerivation rec {
];
buildInputs = [ libuuid ]
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (lvm2 != null) lvm2;
++ lib.optional (readline != null) readline
++ lib.optional (gettext != null) gettext
++ lib.optional (lvm2 != null) lvm2;
configureFlags =
(if (readline != null)
then [ "--with-readline" ]
else [ "--without-readline" ])
++ stdenv.lib.optional (lvm2 == null) "--disable-device-mapper"
++ stdenv.lib.optional enableStatic "--enable-static";
++ lib.optional (lvm2 == null) "--disable-device-mapper"
++ lib.optional enableStatic "--enable-static";
doCheck = true;
checkInputs = [ check util-linux ];
meta = {
meta = with lib; {
description = "Create, destroy, resize, check, and copy partitions";
longDescription = ''
@ -49,13 +49,13 @@ stdenv.mkDerivation rec {
'';
homepage = "https://www.gnu.org/software/parted/";
license = stdenv.lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
maintainers = [
# Add your name here!
];
# GNU Parted requires libuuid, which is part of util-linux-ng.
platforms = stdenv.lib.platforms.linux;
platforms = platforms.linux;
};
}

6
pkgs/tools/filesystems/nixpart/0.4/pyblock.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, lvm2, dmraid }:
{ lib, stdenv, fetchurl, python, lvm2, dmraid }:
stdenv.mkDerivation rec {
pname = "pyblock";
@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
"SITELIB=$(out)/lib/${python.libPrefix}/site-packages"
];
meta = {
meta = with lib; {
description = "Interface for working with block devices";
license = stdenv.lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
};
}

6
pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
View File

@ -1,4 +1,4 @@
{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }:
{ lib, python, buildPythonApplication, fetchurl, urlgrabber }:
buildPythonApplication rec {
pname = "pykickstart";
@ -22,9 +22,9 @@ buildPythonApplication rec {
${python}/bin/${python.executable} tests/baseclass.py -vv
'';
meta = {
meta = with lib; {
homepage = "http://fedoraproject.org/wiki/Pykickstart";
description = "Read and write Fedora kickstart files";
license = stdenv.lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
};
}

10
pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
{ lib, stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
buildPythonApplication rec {
pname = "pyparted";
@ -14,7 +14,7 @@ buildPythonApplication rec {
sed -i -e '
s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path|
' tests/test__ped_ped.py
'' + stdenv.lib.optionalString stdenv.isi686 ''
'' + lib.optionalString stdenv.isi686 ''
# remove some integers in this test case which overflow on 32bit systems
sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \
tests/test__ped_ped.py
@ -33,10 +33,10 @@ buildPythonApplication rec {
make test PYTHON=${python.executable}
'';
meta = {
meta = with lib; {
homepage = "https://fedorahosted.org/pyparted/";
description = "Python interface for libparted";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

17
pkgs/tools/misc/gnuvd/default.nix
View File

@ -1,17 +0,0 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation {
name = "gnuvd-1.0.12";
src = fetchurl {
url = "https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz";
sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz";
};
meta = with lib; {
description = "Command-line dutch dictionary application";
homepage = "https://www.djcbsoftware.nl/code/gnuvd/";
license = licenses.gpl2;
platforms = platforms.unix;
};
}

12
pkgs/tools/package-management/reuse/default.nix
View File

@ -1,19 +1,17 @@
{ lib, python3Packages, fetchFromGitHub }:
with python3Packages;
buildPythonApplication rec {
python3Packages.buildPythonApplication rec {
pname = "reuse";
version = "0.11.1";
version = "0.12.1";
src = fetchFromGitHub {
owner = "fsfe";
repo = "reuse-tool";
rev = "v${version}";
sha256 = "0wkk107s0bpvbknapns0qdzf8csrzc2j6gliy6pa8z208fcfzyy3";
sha256 = "0ql0krnz0fmq405r2qrm9ysm3cvmqfw14j06pny6na7qshibj78z";
};
propagatedBuildInputs = [
propagatedBuildInputs = with python3Packages; [
binaryornot
boolean-py
debian
@ -24,7 +22,7 @@ buildPythonApplication rec {
setuptools_scm
];
checkInputs = [ pytest ];
checkInputs = with python3Packages; [ pytestCheckHook ];
meta = with lib; {
description = "A tool for compliance with the REUSE Initiative recommendations";

6
pkgs/tools/system/zenith/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zenith";
version = "0.11.0";
version = "0.12.0";
src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
sha256 = "1cxmgpq07q6vfasnkx3grpx1y0f0dg6irb9kdn17nwrypy44l92d";
sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax";
};
cargoSha256 = "1kgjj11fwvlk700yp9046b3kiq9ay47fiwqpqfhmlbxw3lsh8qvq";
cargoSha256 = "16s7swv2sp15gry1j1pcyz29cspvafczaf4v02x4fd2jbn2y3f6r";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];

1
pkgs/top-level/aliases.nix
View File

@ -216,6 +216,7 @@ mapAliases ({
};
gnustep-make = gnustep.make; # added 2016-7-6
gnupg20 = throw "gnupg20 has been removed from nixpkgs as upstream dropped support on 2017-12-31";# added 2020-07-12
gnuvd = throw "gnuvd was removed because the backend service is missing"; # added 2020-01-14
go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26
go-pup = pup; # added 2017-12-19
gobjectIntrospection = gobject-introspection; # added 2018-12-02

4
pkgs/top-level/all-packages.nix
View File

@ -4445,8 +4445,6 @@ in
gnutar = callPackage ../tools/archivers/gnutar { };
gnuvd = callPackage ../tools/misc/gnuvd { };
goaccess = callPackage ../tools/misc/goaccess { };
gocryptfs = callPackage ../tools/filesystems/gocryptfs { };
@ -25531,7 +25529,7 @@ in
yate = callPackage ../applications/misc/yate { };
ydiff = callPackage ../development/tools/ydiff { };
inherit (gitAndTools) ydiff;
yed = callPackage ../applications/graphics/yed {};

15
pkgs/top-level/perl-packages.nix
View File

@ -15106,6 +15106,21 @@ let
doCheck = false; /* wants network */
};
NetHTTPSNB = buildPerlPackage {
pname = "Net-HTTPS-NB";
version = "0.15";
src = fetchurl {
url = "mirror://cpan/authors/id/O/OL/OLEG/Net-HTTPS-NB-0.15.tar.gz";
sha256 = "0kwc4z8pqnbc396wjnlgdmri10zdh91f2bi6saxkpfjzlm7wysba";
};
propagatedBuildInputs = [ IOSocketSSL NetHTTP ];
meta = {
homepage = "https://github.com/olegwtf/p5-Net-HTTPS-NB";
description = "Non-blocking HTTPS client";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
};
NetIDNEncode = buildPerlModule {
pname = "Net-IDN-Encode";
version = "2.500";

4
pkgs/top-level/python-packages.nix
View File

@ -1161,6 +1161,8 @@ in {
cerberus = callPackage ../development/python-modules/cerberus { };
cert-chain-resolver = callPackage ../development/python-modules/cert-chain-resolver { };
certbot = callPackage ../development/python-modules/certbot { };
certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { };
@ -7612,6 +7614,8 @@ in {
tls-parser = callPackage ../development/python-modules/tls-parser { };
tmb = callPackage ../development/python-modules/tmb { };
tmdb3 = callPackage ../development/python-modules/tmdb3 { };
todoist = callPackage ../development/python-modules/todoist { };