nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 01:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2019-07-11 09:40:45 +02:00
commit 282c794d61
89 changed files with 461 additions and 324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/build-support/snap/example-firefox.nix → doc/functions/snap/example-firefox.nix
View File

0
pkgs/build-support/snap/example-hello.nix → doc/functions/snap/example-hello.nix
View File

4
doc/functions/snaptools.xml
View File

@ -38,7 +38,7 @@
<para>
The following expression packages GNU Hello as a Snapcraft snap.
</para>
<programlisting><xi:include href="../../pkgs/build-support/snap/example-hello.nix" parse="text" /></programlisting>
<programlisting><xi:include href="./snap/example-hello.nix" parse="text" /></programlisting>
<para>
<command>nix-build</command> this expression and install it with
<command>snap install ./result --dangerous</command>.
@ -57,7 +57,7 @@
example uses Firefox as an example, because it is one of the most
complicated programs we could package.
</para>
<programlisting><xi:include href="../../pkgs/build-support/snap/example-firefox.nix" parse="text" /></programlisting>
<programlisting><xi:include href="./snap/example-firefox.nix" parse="text" /></programlisting>
<para>
<command>nix-build</command> this expression and install it with
<command>snap install ./result --dangerous</command>.

2
lib/systems/doubles.nix
View File

@ -16,7 +16,7 @@ let
"x86_64-cygwin" "x86_64-freebsd" "x86_64-linux"
"x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
"x86_64-darwin" "aarch64-ios" "armv7a-ios" "x86_64-ios" "i686-ios"
"x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
"x86_64-windows" "i686-windows"

6
lib/tests/systems.nix
View File

@ -14,13 +14,13 @@ let
in with lib.systems.doubles; lib.runTests {
testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded);
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" ];
testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
testmips = mseteq mips [ "mipsel-linux" ];
testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
testdarwin = mseteq darwin [ "x86_64-darwin" ];
testdarwin = mseteq darwin [ "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" ];
testfreebsd = mseteq freebsd [ "i686-freebsd" "x86_64-freebsd" ];
testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */);
testillumos = mseteq illumos [ "x86_64-solaris" ];

2
nixos/modules/services/x11/hardware/libinput.nix
View File

@ -178,7 +178,7 @@ in {
};
additionalOptions = mkOption {
type = types.str;
type = types.lines;
default = "";
example =
''

1
nixos/tests/all-tests.nix
View File

@ -77,6 +77,7 @@ in
elk = handleTestOn ["x86_64-linux"] ./elk.nix {};
env = handleTest ./env.nix {};
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
ferm = handleTest ./ferm.nix {};
firefox = handleTest ./firefox.nix {};
firewall = handleTest ./firewall.nix {};

2
nixos/tests/etcd-cluster.nix
View File

@ -140,7 +140,7 @@ in {
};
subtest "should add another member", sub {
$node1->succeed("etcdctl member add node3 https://node3:2380");
$node1->waitUntilSucceeds("etcdctl member add node3 https://node3:2380");
$node3->start();
$node3->waitForUnit("etcd.service");
$node3->waitUntilSucceeds("etcdctl member list | grep 'node3'");

21
pkgs/applications/altcoins/go-ethereum.nix
View File

@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit, fetchpatch }:
{ stdenv, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
buildGoPackage rec {
pname = "go-ethereum";
version = "1.8.27";
version = "1.9.0";
goPackagePath = "github.com/ethereum/go-ethereum";
@ -13,28 +13,17 @@ buildGoPackage rec {
# Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
hardeningDisable = [ "fortify" ];
# Apply ethereum/go-ethereum#19183 to fix the aarch64 build failure.
#
# TODO Remove this patch when upstream (https://github.com/ethereum/go-ethereum)
# fix this problem in the future release.
patches = [
(fetchpatch {
url = "https://github.com/ethereum/go-ethereum/commit/39bd2609.patch";
sha256 = "1a362hzvcjk505hicv25kziy3c6s5an4j7rk4jibcxwgvygb3mz5";
})
];
src = fetchFromGitHub {
owner = "ethereum";
repo = pname;
rev = "v${version}";
sha256 = "1640y7lqy7bvjjgx6wp0cnbw632ls5fj4ixclr819lfz4p5dfhx1";
sha256 = "03gkrvps1syvyjna7769n4j3mlpxcgdj461gzds2l90k02ajvh7x";
};
meta = with stdenv.lib; {
homepage = https://ethereum.github.io/go-ethereum/;
homepage = "https://geth.ethereum.org/";
description = "Official golang implementation of the Ethereum protocol";
license = with licenses; [ lgpl3 gpl3 ];
maintainers = with maintainers; [ adisbladis asymmetric lionello ];
maintainers = with maintainers; [ adisbladis asymmetric lionello xrelkd ];
};
}

6
pkgs/applications/editors/android-studio/default.nix
View File

@ -8,9 +8,9 @@ let
inherit (gnome2) GConf gnome_vfs;
};
stableVersion = {
version = "3.4.1.0"; # "Android Studio 3.4.1"
build = "183.5522156";
sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30";
version = "3.4.2.0"; # "Android Studio 3.4.2"
build = "183.5692245";
sha256Hash = "090rc307mfm0yw4h592l9307lq4aas8zq0ci49csn6kxhds8rsrm";
};
betaVersion = {
version = "3.5.0.17"; # "Android Studio 3.5 Beta 5"

4
pkgs/applications/editors/okteta/default.nix
View File

@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "okteta-${version}";
version = "0.26.1";
version = "0.26.2";
src = fetchurl {
url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
sha256 = "1bqq3ax47xym3ikwn6xsshs1b5gpfg5djrnkzszqnp127f1fxi54";
sha256 = "0k38hd9wq6jvzy0225y61rzr7lgwbac1haalhsrfpmyjy6d833dv";
};
nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

15
pkgs/applications/graphics/krita/default.nix
View File

@ -8,20 +8,13 @@
, python3Packages
}:
let
major = "4.2";
minor = "1";
in
mkDerivation rec {
name = "krita-${version}";
version = "${major}.${minor}";
pname = "krita";
version = "4.2.2";
src = fetchurl {
url = "https://download.kde.org/stable/krita/${major}.${minor}/${name}.tar.gz";
sha256 = "1jm9kj9cq2nhaqg3kvyb193hhkd6al1gh23fkl54dj88x3fpldim";
url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz";
sha256 = "1pzk5bqp3kh22djhvsvmsc7ybirs4hsnkpg1y9677m2gxwbqnnps";
};
nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ];

10
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -245,16 +245,16 @@ in rec {
};
tor-browser-8-5 = tbcommon rec {
ffversion = "60.7.0esr";
tbversion = "8.5.2";
ffversion = "60.8.0esr";
tbversion = "8.5.4";
# FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
src = fetchFromGitHub {
owner = "SLNOS";
repo = "tor-browser";
# branch "tor-browser-60.7.0esr-8.5-2-slnos"
rev = "b8216328bf6bf1996fcd794d4531689a7c373a2f";
sha256 = "0zmqam3c91iww33jpfyl6q6wacj20nqkfzyqryalfvnvx3zi0i1q";
# branch "tor-browser-60.8.0esr-8.5-1-slnos"
rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d";
sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9";
};
patches = [

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -89,7 +89,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
version = "8.5.3";
version = "8.5.4";
lang = "en-US";
@ -99,7 +99,7 @@ let
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "15ml0azc7imlfc2h88yxpxsyrf6pxxcd1si33bfbsjh17zw1282g";
sha256 = "0nnzynk3nlnd847c8jjghs9anmr5a2hv7nk1qxigigxqa5vqy96z";
};
"i686-linux" = fetchurl {
@ -107,7 +107,7 @@ let
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "1zvcy44qx353qa5h90g0qigbp9xgaiq8s7a5wmhnfrfd2iw4ph7d";
sha256 = "1b34skl3hwvpy0r4l5ykgnnwhbz7cvly2gi9ib4h7lijjfafiys1";
};
};
in

8
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -4,11 +4,11 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
version = "1.7.10";
sha256Hash = "04if7siv0ib5sbdkdc7vwmxyjy3fnijrshgc8i8m79marfkn3wac";
version = "1.7.14";
sha256Hash = "1bw804a9kffmn23wv0570wihbvfm7jy9cqmxlv196f4j7bw7zkv3";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "480743";
archPatchesHash = "0jfyp642l2850yzgrw3irq8bn6vl44rx2693c5cshwbihd212af7";
archPatchesRevision = "487779";
archPatchesHash = "0f09hvimb66xqksb2v0zc4ryshx7y7z0rafzjd99x37rpib9f3kq";
};
in {
stable = mkTelegram stableVersion;

22
pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
View File

@ -28,13 +28,17 @@ mkDerivation rec {
sha256 = archPatchesHash;
};
# TODO: libtgvoip.patch no-gtk2.patch
# TODO: Avoid tdesktop_lottie_animation_qtdebug.patch and tdesktop_qtlottie_qtdebug.patch
patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" ];
patches = [
"${archPatches}/tdesktop.patch"
"${archPatches}/no-gtk2.patch"
# "${archPatches}/Use-system-wide-font.patch"
"${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
"${archPatches}/issue6219.patch"
];
postPatch = ''
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libs.cpp \
--replace '"appindicator"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
--replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"'
substituteInPlace Telegram/SourceFiles/platform/linux/linux_libnotify.cpp \
--replace '"notify"' '"${libnotify}/lib/libnotify.so"'
'';
@ -75,12 +79,14 @@ mkDerivation rec {
CPPFLAGS = NIX_CFLAGS_COMPILE;
preConfigure = ''
patch -R -Np1 -i "${archPatches}/demibold.patch"
pushd "Telegram/ThirdParty/libtgvoip"
patch -Np1 -i "${archPatches}/libtgvoip.patch"
popd
pushd "Telegram/ThirdParty/qtlottie"
patch -Np1 -i "${archPatches}/tdesktop_qtlottie_qtdebug.patch"
popd
# disable static-qt for rlottie
sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
sed -i Telegram/gyp/telegram_linux.gypi \
-e 's,/usr,/does-not-exist,g' \
@ -118,6 +124,8 @@ mkDerivation rec {
export ASM=$(type -p gcc)
'';
cmakeFlags = [ "-UTDESKTOP_OFFICIAL_TARGET" ];
installPhase = ''
install -Dm755 Telegram $out/bin/telegram-desktop

2
pkgs/applications/networking/p2p/frostwire/default.nix
View File

@ -85,7 +85,7 @@ in stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
homepage = http://www.frostwire.com/;
homepage = https://www.frostwire.com/;
description = "BitTorrent Client and Cloud File Downloader";
license = licenses.gpl2;
maintainers = with maintainers; [ gavin ];

6
pkgs/applications/office/treesheets/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "treesheets-${version}";
version = "2018-08-18";
version = "1.0.1";
src = fetchFromGitHub {
owner = "aardappel";
repo = "treesheets";
rev = "3af41d99c8f9f32603a36ab64af3560b6d61dd73";
sha256 = "147y8ggh3clwjgsi15z8i4jnzlkh8p17mmlg532jym53zzbcva65";
rev = "v${version}";
sha256 = "0krsj7i5yr76imf83krz2lmlmpbsvpwqg2d4r0jwxiydjfyj4qr4";
};
buildInputs = [ wxGTK makeWrapper ];

2
pkgs/applications/science/biology/itsx/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing";
homepage = http://microbiology.se/software/itsx/;
homepage = https://microbiology.se/software/itsx/;
license = licenses.gpl3;
maintainers = [ maintainers.bzizou ];
platforms = [ "x86_64-linux" "i686-linux" ];

2
pkgs/applications/science/logic/prover9/default.nix
View File

@ -31,7 +31,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = http://www.cs.unm.edu/~mccune/mace4/;
homepage = https://www.cs.unm.edu/~mccune/mace4/;
license = "GPL";
description = "Automated theorem prover for first-order and equational logic";
longDescription = ''

8
pkgs/applications/version-management/gitkraken/default.nix
View File

@ -2,7 +2,7 @@
, libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig
, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme
, dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid
}:
with stdenv.lib;
@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
name = "gitkraken-${version}";
version = "5.0.4";
version = "6.0.0";
src = fetchurl {
url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb";
sha256 = "1fq0w8djkcx5jr2pw6izlq5rkwbq3r3f15xr3dmmbz6gjvi3nra0";
sha256 = "1ykjdnzl34pqr6dhfnswix44i412c7gcba1pk95a8670wmc29a1f";
};
libPath = makeLibraryPath [
@ -53,6 +53,8 @@ stdenv.mkDerivation rec {
gnome2.GConf
libgnome-keyring
openssl
at-spi2-atk
libuuid
];
desktopItem = makeDesktopItem {

2
pkgs/applications/version-management/gitolite/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Finely-grained git repository hosting";
homepage = http://gitolite.com/gitolite/index.html;
homepage = https://gitolite.com/gitolite/index.html;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ];

6
pkgs/applications/window-managers/sway/idle.nix
View File

@ -5,17 +5,17 @@
stdenv.mkDerivation rec {
name = "swayidle-${version}";
version = "1.3";
version = "1.4";
src = fetchFromGitHub {
owner = "swaywm";
repo = "swayidle";
rev = version;
sha256 = "04agcbhc473jkk7npb40i94ny8naykxzpjcw2lvl05kxv65y5d9v";
sha256 = "1fpacy9jwfi3vd94sgsy8qgx5092rm3vsplj2zjbmxkak1gjn56n";
};
postPatch = ''
sed -iE "s/version: '1\.2',/version: '${version}',/" meson.build
sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build
'';
nativeBuildInputs = [ meson ninja pkgconfig scdoc ];

2
pkgs/data/fonts/input-fonts/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
src = requireFile {
name = "Input-Font.zip";
url = "http://input.fontbureau.com/download/";
url = "https://input.fontbureau.com/download/";
sha256 = "07fkyvbb12agkb2kpnq2j45nycgbjvb4n1s5hjyqsipdh2z9zihq";
};

2
pkgs/desktops/enlightenment/econnman.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A user interface for the connman network connection manager";
homepage = http://enlightenment.org/;
homepage = https://enlightenment.org/;
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;

2
pkgs/desktops/enlightenment/efl.nix
View File

@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Enlightenment foundation libraries";
homepage = http://enlightenment.org/;
homepage = https://enlightenment.org/;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.lgpl3;
maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];

2
pkgs/desktops/enlightenment/rage.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Video + Audio player along the lines of mplayer";
homepage = http://enlightenment.org/;
homepage = https://enlightenment.org/;
maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd2;

13
pkgs/development/compilers/colm/cross-compile.patch Normal file
View File

@ -0,0 +1,13 @@
--- a/configure.ac 2019-07-09 22:41:03.166948024 -0700
+++ b/configure.ac 2019-07-09 22:41:16.699948056 -0700
@@ -40,9 +40,7 @@
dnl Choose a default for the build_manual var. If the dist file is present in
dnl the root then default to no, otherwise go for it.
-AC_CHECK_FILES( [$srcdir/DIST],
- [. $srcdir/DIST;],
- [build_manual=yes; ] )
+build_manual=yes;
dnl Set to true if the manual should be built.
AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"])

6
pkgs/development/compilers/colm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }:
{ stdenv, fetchurl, makeWrapper, gcc, asciidoc, autoreconfHook }:
stdenv.mkDerivation rec {
name = "colm-${version}";
@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
};
nativeBuildInputs = [ makeWrapper asciidoc ];
patches = [ ./cross-compile.patch ];
nativeBuildInputs = [ makeWrapper asciidoc autoreconfHook ];
doCheck = true;

2
pkgs/development/compilers/nvidia-cg-toolkit/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://developer.nvidia.com/cg-toolkit;
homepage = https://developer.nvidia.com/cg-toolkit;
license = lib.licenses.unfreeRedistributable;
};
}

2
pkgs/development/interpreters/erlang/R16B02-basho.nix
View File

@ -27,7 +27,7 @@ mkDerivation rec {
installTargets = "install";
postInstall = let
manpages = pkgs.fetchurl {
url = "http://www.erlang.org/download/otp_doc_man_R16B02.tar.gz";
url = "https://www.erlang.org/download/otp_doc_man_R16B02.tar.gz";
sha256 = "12apxjmmd591y9g9bhr97z5jbd1jarqg7wj0y2sqhl21hc1yp75p";
};
in ''

4
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -108,8 +108,8 @@ in stdenv.mkDerivation ({
setupHook = ./setup-hook.sh;
meta = with stdenv.lib; ({
homepage = http://www.erlang.org/;
downloadPage = "http://www.erlang.org/download.html";
homepage = https://www.erlang.org/;
downloadPage = "https://www.erlang.org/download.html";
description = "Programming language used for massively scalable soft real-time systems";
longDescription = ''

2
pkgs/development/java-modules/jogl/default.nix
View File

@ -58,7 +58,7 @@ in
meta = with stdenv.lib; {
description = "Java libraries for 3D Graphics, Multimedia and Processing";
homepage = http://jogamp.org/;
homepage = https://jogamp.org/;
license = licenses.bsd3;
platforms = [ "x86_64-linux" ];
};

27
pkgs/development/libraries/cpp-utilities/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, cppunit }:
stdenv.mkDerivation rec {
pname = "cpp-utilities";
version = "4.17.1";
src = fetchFromGitHub {
owner = "Martchus";
repo = pname;
rev = "v${version}";
sha256 = "12088cwg3jbqipmbn4843w1cgxi1q6vwx47gy042rkfvbk6azhxl";
};
nativeBuildInputs = [ cmake ];
checkInputs = [ cppunit ];
# Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files
checkFlagsArray = [ "LD_LIBRARY_PATH=$(PWD)" ];
doCheck = true;
meta = with stdenv.lib; {
homepage = "https://github.com/Martchus/cpp-utilities";
description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities";
license = licenses.gpl2;
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.linux;
};
}

2
pkgs/development/libraries/freetds/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "1.1.6";
src = fetchurl {
url = "http://www.freetds.org/files/stable/${name}.tar.bz2";
url = "https://www.freetds.org/files/stable/${name}.tar.bz2";
sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2";
};

2
pkgs/development/libraries/glfw/3.x.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
homepage = http://www.glfw.org/;
homepage = https://www.glfw.org/;
license = licenses.zlib;
maintainers = with maintainers; [ marcweber ];
platforms = platforms.unix;

4
pkgs/development/libraries/hwloc/default.nix
View File

@ -15,7 +15,7 @@ in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "http://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2";
sha256 = "1aa7s208gdijk19vvzzahyl8pglk1va3yd6kdbpfa5pz5ms0ag35";
};
@ -78,7 +78,7 @@ in stdenv.mkDerivation {
more.
'';
# http://www.open-mpi.org/projects/hwloc/license.php
# https://www.open-mpi.org/projects/hwloc/license.php
license = licenses.bsd3;
homepage = https://www.open-mpi.org/projects/hwloc/;
maintainers = with maintainers; [ fpletz markuskowa ];

2
pkgs/development/libraries/ilmbase/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
doCheck = stdenv.isx86_64;
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;
homepage = https://www.openexr.com/;
license = licenses.bsd3;
platforms = platforms.all;
};

2
pkgs/development/libraries/libnxml/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = [ curl ];
meta = {
homepage = http://www.autistici.org/bakunin/libnxml/;
homepage = https://www.autistici.org/bakunin/libnxml/;
description = "C library for parsing, writing and creating XML 1.0 and 1.1 files or streams";
license = stdenv.lib.licenses.lgpl2;

2
pkgs/development/libraries/libow/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "1-Wire File System full library";
homepage = http://owfs.org/;
homepage = https://owfs.org/;
license = licenses.gpl2;
maintainers = with maintainers; [ disserman ];
platforms = platforms.unix;

2
pkgs/development/libraries/liquid-dsp/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook ];
meta = {
homepage = http://liquidsdr.org/;
homepage = https://liquidsdr.org/;
description = "Digital signal processing library for software-defined radios";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;

2
pkgs/development/libraries/openexr/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
doCheck = false; # fails 1 of 1 tests
meta = with stdenv.lib; {
homepage = http://www.openexr.com/;
homepage = https://www.openexr.com/;
license = licenses.bsd3;
platforms = platforms.all;
};

4
pkgs/development/libraries/openmpi/default.nix
View File

@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
name = "openmpi-${version}";
src = with stdenv.lib.versions; fetchurl {
url = "http://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${name}.tar.bz2";
sha256 = "02cpzcp113gj5hb0j2xc0cqma2fn04i2i0bzf80r71120p9bdryc";
};
@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
doCheck = true;
meta = with stdenv.lib; {
homepage = http://www.open-mpi.org/;
homepage = https://www.open-mpi.org/;
description = "Open source MPI-3 implementation";
longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
maintainers = with maintainers; [ markuskowa ];

8
pkgs/development/libraries/science/math/fenics/default.nix
View File

@ -83,7 +83,7 @@ let
'';
meta = {
description = "A domain-specific language for finite element variational forms";
homepage = http://fenicsproject.org/;
homepage = https://fenicsproject.org/;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.lgpl3;
};
@ -102,7 +102,7 @@ let
'';
meta = {
description = "A compiler for finite element variational forms";
homepage = http://fenicsproject.org/;
homepage = https://fenicsproject.org/;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.lgpl3;
};
@ -117,7 +117,7 @@ let
buildInputs = [ numpy six ];
meta = {
description = "Instant inlining of C and C++ code in Python";
homepage = http://fenicsproject.org/;
homepage = https://fenicsproject.org/;
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.lgpl3;
};
@ -162,7 +162,7 @@ stdenv.mkDerivation {
postInstall = "source $out/share/dolfin/dolfin.conf";
meta = {
description = "The FEniCS Problem Solving Environment in Python and C++";
homepage = http://fenicsproject.org/;
homepage = https://fenicsproject.org/;
platforms = stdenv.lib.platforms.darwin;
license = stdenv.lib.licenses.lgpl3;
};

16
pkgs/development/lua-modules/generated-packages.nix
View File

@ -150,7 +150,7 @@ cjson = buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = with stdenv.lib; {
homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php";
homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php";
description = "A fast JSON encoding/parsing module";
license = {
fullName = "MIT";
@ -236,7 +236,7 @@ cyrussasl = buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = with stdenv.lib; {
homepage = "http://github.com/JorjBauer/lua-cyrussasl";
homepage = "https://github.com/JorjBauer/lua-cyrussasl";
description = "Cyrus SASL library for Lua 5.1+";
maintainers = with maintainers; [ vcunat ];
license = {
@ -385,7 +385,7 @@ lgi = buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = with stdenv.lib; {
homepage = "http://github.com/pavouk/lgi";
homepage = "https://github.com/pavouk/lgi";
description = "Lua bindings to GObject libraries";
license = {
fullName = "MIT/X11";
@ -480,7 +480,7 @@ lrexlib-gnu = buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = with stdenv.lib; {
homepage = "http://github.com/rrthomas/lrexlib";
homepage = "https://github.com/rrthomas/lrexlib";
description = "Regular expression library binding (GNU flavour).";
license = {
fullName = "MIT/X11";
@ -499,7 +499,7 @@ lrexlib-pcre = buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = with stdenv.lib; {
homepage = "http://github.com/rrthomas/lrexlib";
homepage = "https://github.com/rrthomas/lrexlib";
description = "Regular expression library binding (PCRE flavour).";
maintainers = with maintainers; [ vyp ];
license = {
@ -519,7 +519,7 @@ lrexlib-posix = buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = with stdenv.lib; {
homepage = "http://github.com/rrthomas/lrexlib";
homepage = "https://github.com/rrthomas/lrexlib";
description = "Regular expression library binding (POSIX flavour).";
license = {
fullName = "MIT/X11";
@ -567,7 +567,7 @@ lua-cmsgpack = buildLuarocksPackage {
propagatedBuildInputs = [ lua ];
meta = with stdenv.lib; {
homepage = "http://github.com/antirez/lua-cmsgpack";
homepage = "https://github.com/antirez/lua-cmsgpack";
description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3";
license = {
fullName = "Two-clause BSD";
@ -955,7 +955,7 @@ luaposix = buildLuarocksPackage {
propagatedBuildInputs = [ bit32 lua std_normalize ];
meta = with stdenv.lib; {
homepage = "http://github.com/luaposix/luaposix/";
homepage = "https://github.com/luaposix/luaposix/";
description = "Lua bindings for POSIX";
maintainers = with maintainers; [ vyp lblasc ];
license = {

2
pkgs/development/misc/amdadl-sdk/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "API to access display driver functionality for ATI graphics cards";
homepage = http://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
homepage = https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/;
license = licenses.unfree;
maintainers = [ maintainers.offline ];
platforms = stdenv.lib.platforms.linux;

8
pkgs/development/mobile/cocoapods/Gemfile-beta.lock
View File

@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.3)
cocoapods (1.7.4)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.3)
cocoapods-core (= 1.7.4)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.3)
cocoapods-core (1.7.4)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
@ -59,7 +59,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.10.0)
xcodeproj (1.11.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)

8
pkgs/development/mobile/cocoapods/Gemfile.lock
View File

@ -9,10 +9,10 @@ GEM
tzinfo (~> 1.1)
atomos (0.1.3)
claide (1.0.2)
cocoapods (1.7.3)
cocoapods (1.7.4)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.7.3)
cocoapods-core (= 1.7.4)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 1.2.2, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
@ -28,7 +28,7 @@ GEM
nap (~> 1.0)
ruby-macho (~> 1.4)
xcodeproj (>= 1.10.0, < 2.0)
cocoapods-core (1.7.3)
cocoapods-core (1.7.4)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
@ -59,7 +59,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xcodeproj (1.10.0)
xcodeproj (1.11.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)

12
pkgs/development/mobile/cocoapods/gemset-beta.nix
View File

@ -46,10 +46,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv";
sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc";
type = "gem";
};
version = "1.7.3";
version = "1.7.4";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
@ -57,10 +57,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31";
sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c";
type = "gem";
};
version = "1.7.3";
version = "1.7.4";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -292,9 +292,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
type = "gem";
};
version = "1.10.0";
version = "1.11.0";
};
}

12
pkgs/development/mobile/cocoapods/gemset.nix
View File

@ -40,10 +40,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0c0xh7wh8l34wqiiwwhdakm6zin8xd5svgh63c6pb2pd1d4phhyv";
sha256 = "1h0cnrxh5k61yfh3f3kdx67gwfkvnvaqgsmwbmqpl7ffbpsg5gsc";
type = "gem";
};
version = "1.7.3";
version = "1.7.4";
};
cocoapods-core = {
dependencies = ["activesupport" "fuzzy_match" "nap"];
@ -51,10 +51,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0p76z708fbb61x0m585iaf912f0s3qw0a1mryhpqa2wyrjrlmg31";
sha256 = "0xbpaisml77q9k5bk5f7hfkzmnjymzczinvhgim34nvwd00rd30c";
type = "gem";
};
version = "1.7.3";
version = "1.7.4";
};
cocoapods-deintegrate = {
groups = ["default"];
@ -254,9 +254,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x2ypkxyfsr6k8qy75iy64p6af6b024fqnlmw8qvzzzixmwrr8q7";
sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j";
type = "gem";
};
version = "1.10.0";
version = "1.11.0";
};
}

2
pkgs/development/python-modules/distributed/default.nix
View File

@ -54,7 +54,7 @@ buildPythonPackage rec {
meta = {
description = "Distributed computation in Python.";
homepage = http://distributed.readthedocs.io/en/latest/;
homepage = https://distributed.readthedocs.io/en/latest/;
license = lib.licenses.bsd3;
platforms = lib.platforms.x86; # fails on aarch64
maintainers = with lib.maintainers; [ teh costrouc ];

2
pkgs/development/python-modules/faulthandler/default.nix
View File

@ -13,6 +13,6 @@ buildPythonPackage rec {
description = "Dump the Python traceback";
license = stdenv.lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ sauyon ];
homepage = http://faulthandler.readthedocs.io/;
homepage = https://faulthandler.readthedocs.io/;
};
}

2
pkgs/development/python-modules/flask-restful/default.nix
View File

@ -33,7 +33,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ];
meta = with lib; {
homepage = "http://flask-restful.readthedocs.io/";
homepage = "https://flask-restful.readthedocs.io/";
description = "REST API building blocks for Flask";
license = licenses.bsd3;
};

2
pkgs/development/python-modules/gentools/default.nix
View File

@ -24,7 +24,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Tools for generators, generator functions, and generator-based coroutines";
license = licenses.mit;
homepage = http://gentools.readthedocs.io/;
homepage = https://gentools.readthedocs.io/;
maintainers = with maintainers; [ mredaelli ];
};

2
pkgs/development/python-modules/habanero/default.nix
View File

@ -22,7 +22,7 @@ buildPythonPackage rec {
meta = {
description = "Python interface to Library Genesis";
homepage = http://habanero.readthedocs.io/en/latest/;
homepage = https://habanero.readthedocs.io/en/latest/;
license = lib.licenses.mit;
maintainers = [ lib.maintainers.nico202 ];
};

2
pkgs/development/python-modules/hiro/default.nix
View File

@ -12,7 +12,7 @@ buildPythonPackage rec {
meta = with stdenv.lib; {
description = "Time manipulation utilities for Python";
homepage = http://hiro.readthedocs.io/en/latest/;
homepage = https://hiro.readthedocs.io/en/latest/;
license = licenses.mit;
maintainers = with maintainers; [ nyarly ];
};

2
pkgs/development/python-modules/papis/default.nix
View File

@ -47,7 +47,7 @@ buildPythonPackage rec {
meta = {
description = "Powerful command-line document and bibliography manager";
homepage = http://papis.readthedocs.io/en/latest/;
homepage = https://papis.readthedocs.io/en/latest/;
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ nico202 teto ];
};

21
pkgs/development/python-modules/pysmf/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, buildPythonPackage, fetchPypi, pkg-config, libsmf, glib, pytest }:
buildPythonPackage rec {
pname = "pysmf";
version = "0.1.1";
src = fetchPypi {
inherit pname version;
sha256 = "10i7vvvdx6c3gl4afsgnpdanwgzzag087zs0fxvfipnqknazj806";
};
nativeBuildInputs = [ pkg-config pytest ];
buildInputs = [ libsmf glib ];
meta = with stdenv.lib; {
homepage = "http://das.nasophon.de/pysmf/";
description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf.";
license = licenses.bsd2;
maintainers = [ maintainers.gnidorah ];
};
}

2
pkgs/development/tools/build-managers/doit/default.nix
View File

@ -25,7 +25,7 @@ in python3Packages.buildPythonApplication {
checkPhase = "py.test";
meta = with stdenv.lib; {
homepage = http://pydoit.org/;
homepage = https://pydoit.org/;
description = "A task management & automation tool";
license = licenses.mit;
longDescription = ''

2
pkgs/development/tools/phantomjs/default.nix
View File

@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
- Network Monitoring
'';
homepage = http://phantomjs.org/;
homepage = https://phantomjs.org/;
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.bluescreen303 ];

2
pkgs/development/tools/phantomjs2/default.nix
View File

@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
- Network Monitoring
'';
homepage = http://phantomjs.org/;
homepage = https://phantomjs.org/;
license = licenses.bsd3;
maintainers = [ maintainers.aflatter ];

5
pkgs/os-specific/linux/fuse/common.nix
View File

@ -38,7 +38,10 @@ in stdenv.mkDerivation rec {
outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common";
mesonFlags = stdenv.lib.optional isFuse3 "-Dudevrulesdir=etc/udev/rules.d";
mesonFlags = stdenv.lib.optionals isFuse3 [
"-Dudevrulesdir=/udev/rules.d"
"-Duseroot=false"
];
preConfigure = ''
export MOUNT_FUSE_PATH=$out/sbin

4
pkgs/os-specific/linux/fuse/default.nix
View File

@ -11,7 +11,7 @@ in {
};
fuse_3 = mkFuse {
version = "3.6.1";
sha256Hash = "1118r2nx64cpv9s5a6dgh49y0pnjcc5ybpkh5pigxf14bpqa26pb";
version = "3.6.2";
sha256Hash = "1cxx94q6zqns1iw5d4g3ll8f78swqxl6h25bpxmqkqsj6c91pzkl";
};
}

37
pkgs/os-specific/linux/fuse/fuse3-install.patch
View File

@ -1,37 +1,18 @@
--- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200
+++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200
@@ -22,30 +22,11 @@
DESTDIR="${DESTDIR%/}"
--- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200
+++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200
@@ -37,10 +37,10 @@
fi
-chown root:root "${DESTDIR}${bindir}/fusermount3"
-chmod u+s "${DESTDIR}${bindir}/fusermount3"
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
"${DESTDIR}${sysconfdir}/fuse.conf"
-
-if test ! -e "${DESTDIR}/dev/fuse"; then
- mkdir -p "${DESTDIR}/dev"
- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
-fi
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
- "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+ "${sysconfdir}/udev/rules.d/99-fuse3.rules"
+ "${sysconfdir}${udevrulesdir}/99-fuse3.rules"
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
"${DESTDIR}${sysconfdir}/init.d/fuse3"
-
-
-if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
- /usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
-else
- echo "== FURTHER ACTION REQUIRED =="
- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
-fi
-
-
- "${DESTDIR}/etc/init.d/fuse3"
+ "${sysconfdir}/init.d/fuse3"
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
diff --git a/util/meson.build b/util/meson.build
index aa0e734..06d4378 100644
--- a/util/meson.build

4
pkgs/os-specific/linux/kernel/linux-4.14.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.14.132";
version = "4.14.133";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "0c7k5yl2h929kvbzqij0p56myp9v14im4s72wky5d9idfadg71ns";
sha256 = "005pg4f8l2qz8g6hd71pj567z91hwjwdwb37h4dbb3fj6kjl965y";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.19.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "4.19.57";
version = "4.19.58";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "11rz1pfphc4zkn3fbfavn1764g3ymp4b1bfnr7b630w8smcmfz1j";
sha256 = "1waqk2ggnnaqa5pxhdbvxkkchvxxz9pbkqnr5pn5rj6h2v5644az";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.4.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.4.184";
version = "4.4.185";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1jn3mwnfcvhnn0bqiyabkqii3rd6w5b982w3i085qj42q0pj6hv5";
sha256 = "1ll694m5193dmwn8ys4sf2p6a6njd5pm38v862ih1iw7l3vj0l3s";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-4.9.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
version = "4.9.184";
version = "4.9.185";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1bwzmmpc7k9n7p2s383pipdjc3hvqfbbacaxk7gdw9856pai8c83";
sha256 = "16z3ijfzffpkp4mj42j3j8zbnpba1a67kd5cdqwb28spf32a66vc";
};
} // (args.argsOverride or {}))

4
pkgs/os-specific/linux/kernel/linux-5.1.nix
View File

@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
version = "5.1.16";
version = "5.1.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "0gms4zkx97njzk1czsnih6jj9f6knismixxndn1h11vq7sz5agla";
sha256 = "0gf4jqmq6b66jrlygmvn2z8xif3n83yq85jldbm3r257crww6dar";
};
} // (args.argsOverride or {}))

10
pkgs/os-specific/linux/nvidia-x11/builder.sh
View File

@ -58,14 +58,16 @@ installPhase() {
mkdir $i/lib/vdpau
mv $i/lib/libvdpau* $i/lib/vdpau
# Install ICDs.
install -Dm644 nvidia.icd $i/etc/OpenCL/vendors/nvidia.icd
# Install ICDs, make absolute paths.
sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed
install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd
if [ -e nvidia_icd.json.template ]; then
sed "s#__NV_VK_ICD__#libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json
install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json
fi
if [ "$useGLVND" = "1" ]; then
install -Dm644 10_nvidia.json $i/share/glvnd/egl_vendor.d/nvidia.json
sed -E "s#(libEGL_nvidia)#$i/lib/\\1#" 10_nvidia.json > 10_nvidia.json.fixed
install -Dm644 10_nvidia.json.fixed $i/share/glvnd/egl_vendor.d/nvidia.json
fi
done

4
pkgs/servers/atlassian/jira.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "8.2.2";
version = "8.2.3";
src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "1azis5jxrdfviyvvbpzlrpqaayvzs9kggmj4rv9gbsn7ji96i781";
sha256 = "1078s225rb44y7nfsvd1vba9jjn14rdsxvdgah164i0nd16070sn";
};
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

28
pkgs/servers/dex/default.nix
View File

@ -1,36 +1,36 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "dex";
version = "2.16.0";
goPackagePath = "github.com/dexidp/dex";
version = "2.17.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "dexidp";
repo = pname;
sha256 = "0w8nl7inqp4grbaq320dgynmznbrln8vihd799dwb2cx86laxsi1";
rev = "v${version}";
sha256 = "1z94svpiwrs64m83gpfnniv0ac1fnmvywvl05f20ind1wlf8bvwn";
};
modSha256 = "043sjq547nwg5v8708nhij0g7d2j28pyn676fgbnpps35ymnywfi";
subPackages = [
"cmd/dex"
];
buildFlagsArray = [
"-ldflags=-w -X ${goPackagePath}/version.Version=${src.rev}"
"-ldflags=-w -X github.com/dexidp/dex/version.Version=${src.rev}"
];
postInstall = ''
mkdir -p $out/share
cp -r go/src/${goPackagePath}/web $out/share/web
cp -r $src/web $out/share/web
'';
meta = {
meta = with lib; {
description = "OpenID Connect and OAuth2 identity provider with pluggable connectors";
license = lib.licenses.asl20;
homepage = https://github.com/dexidp/dex;
maintainers = with lib.maintainers; [benley];
platforms = lib.platforms.unix;
homepage = "https://github.com/dexidp/dex";
license = licenses.asl20;
maintainers = with maintainers; [ benley ];
platforms = platforms.unix;
};
}

7
pkgs/servers/etcd/default.nix
View File

@ -4,7 +4,7 @@ with lib;
buildGoPackage rec {
name = "etcd-${version}";
version = "3.3.1"; # After updating check that nixos tests pass
version = "3.3.13"; # After updating check that nixos tests pass
rev = "v${version}";
goPackagePath = "github.com/coreos/etcd";
@ -13,15 +13,12 @@ buildGoPackage rec {
inherit rev;
owner = "coreos";
repo = "etcd";
sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl";
sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy";
};
subPackages = [
"cmd/etcd"
"cmd/etcdctl"
"cmd/tools/benchmark"
"cmd/tools/etcd-dump-db"
"cmd/tools/etcd-dump-logs"
];
buildInputs = [ libpcap ];

4
pkgs/servers/monitoring/prometheus/default.nix
View File

@ -48,7 +48,7 @@ in rec {
};
prometheus_2 = buildPrometheus {
version = "2.10.0";
sha256 = "00597rf4cg20clr3g3ql3nf47r8qij2xspcpp8y8mpxm2b60zjnq";
version = "2.11.0";
sha256 = "0x5q2zv8nvqdns8780rsbdhv44azg1fz631ji2rlmiy1l6n1q3hb";
};
}

38
pkgs/tools/audio/mididings/default.nix Normal file
View File

@ -0,0 +1,38 @@
{ stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2 }:
pythonPackages.buildPythonApplication rec {
version = "20151117";
pname = "mididings";
src = fetchFromGitHub {
owner = "dsacre";
repo = "mididings";
rev = "bbec99a8c878a2a7029e78e84fc736e4a68ed5a0";
sha256 = "1pdf5mib87zy7yjh9vpasja419h28wvgq6x5hw2hkm7bg9ds4p2m";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib alsaLib libjack2 pythonPackages.boost ];
propagatedBuildInputs = with pythonPackages; [ decorator ]
# for livedings
++ [ tkinter pyliblo ]
# for mididings.extra
++ [ dbus-python pyinotify ]
# to read/write standard MIDI files
++ [ pysmf ]
# so mididings knows where to look for config files
++ [ pyxdg ];
preBuild = with stdenv.lib.versions; ''
substituteInPlace setup.py \
--replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}"
'';
meta = with stdenv.lib; {
description = "A MIDI router and processor based on Python, supporting ALSA and JACK MIDI";
homepage = "http://das.nasophon.de/mididings";
license = licenses.gpl2;
maintainers = [ maintainers.gnidorah ];
platforms = platforms.linux;
};
}

2
pkgs/tools/audio/mpdas/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Music Player Daemon AudioScrobbler";
homepage = http://50hz.ws/mpdas/;
homepage = https://50hz.ws/mpdas/;
license = licenses.bsd3;
maintainers = [ maintainers.taketwo ];
platforms = platforms.all;

51
pkgs/tools/misc/fzf/default.nix
View File

@ -1,27 +1,24 @@
{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }:
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }:
buildGoPackage rec {
name = "fzf-${version}";
version = "0.17.5";
rev = "${version}";
goPackagePath = "github.com/junegunn/fzf";
buildGoModule rec {
pname = "fzf";
version = "0.18.0";
src = fetchFromGitHub {
inherit rev;
owner = "junegunn";
repo = "fzf";
sha256 = "04kalm25sn5k24nrdmbkafp4zvxpm2l3rxchvccl0kz0j3szh62z";
repo = pname;
rev = version;
sha256 = "0pwpr4fpw56yzzkcabzzgbgwraaxmp7xzzmap7w1xsrkbj7dl2xl";
};
outputs = [ "bin" "out" "man" ];
modSha256 = "0xc4166d74ix5nzjphrq4rgw7qpskz05ymzl77i2qh2nhbdb53p0";
outputs = [ "out" "man" ];
fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";
buildInputs = [ ncurses ];
goDeps = ./deps.nix;
patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$bin'|" plugin/fzf.vim
@ -33,30 +30,34 @@ buildGoPackage rec {
'';
preInstall = ''
mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d
cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish
cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d}
cp $src/shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish
cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
'';
postInstall = ''
cp $src/bin/fzf-tmux $bin/bin
name="${pname}-${version}"
cp $src/bin/fzf-tmux $out/bin
mkdir -p $man/share/man
cp -r $src/man/man1 $man/share/man
mkdir -p $out/share/vim-plugins/${name}
cp -r $src/plugin $out/share/vim-plugins/${name}
cp -R $src/shell $bin/share/fzf
cat <<SCRIPT > $bin/bin/fzf-share
mkdir -p $out/share/vim-plugins/$name
cp -r $src/plugin $out/share/vim-plugins/$name
cp -R $src/shell $out/share/fzf
cat <<SCRIPT > $out/bin/fzf-share
#!${runtimeShell}
# Run this script to find the fzf shared folder where all the shell
# integration scripts are living.
echo $bin/share/fzf
echo $out/share/fzf
SCRIPT
chmod +x $bin/bin/fzf-share
chmod +x $out/bin/fzf-share
'';
meta = with stdenv.lib; {
homepage = https://github.com/junegunn/fzf;
meta = with lib; {
homepage = "https://github.com/junegunn/fzf";
description = "A command-line fuzzy finder written in Go";
license = licenses.mit;
platforms = platforms.unix;

84
pkgs/tools/misc/fzf/deps.nix generated
View File

@ -1,84 +0,0 @@
# This file was generated by go2nix.
[
{
goPackagePath = "github.com/gdamore/encoding";
fetch = {
type = "git";
url = "https://github.com/gdamore/encoding";
rev = "b23993cbb6353f0e6aa98d0ee318a34728f628b9";
sha256 = "0d7irqpx2fa9vkxgkhf04yiwazsm10fxh0yk86x5crflhph5fv8a";
};
}
{
goPackagePath = "github.com/gdamore/tcell";
fetch = {
type = "git";
url = "https://github.com/gdamore/tcell";
rev = "44772c121bb7838819d3ba4a7e84c0c2d617328e";
sha256 = "1l6yhy2bqckanjvixzvslz6qjjl5s0ciqf9hvk6625a7kfx030i6";
};
}
{
goPackagePath = "github.com/lucasb-eyer/go-colorful";
fetch = {
type = "git";
url = "https://github.com/lucasb-eyer/go-colorful";
rev = "c900de9dbbc73129068f5af6a823068fc5f2308c";
sha256 = "0h6dkm5cvnlibngdhkqq7dh8ql8fjzfxn9xqpl3nv10rfwqdk80h";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8";
sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50";
sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";
};
}
{
goPackagePath = "github.com/mattn/go-shellwords";
fetch = {
type = "git";
url = "https://github.com/mattn/go-shellwords";
rev = "02e3cf038dcea8290e44424da473dd12be796a8a";
sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr";
};
}
{
goPackagePath = "golang.org/x/crypto";
fetch = {
type = "git";
url = "https://go.googlesource.com/crypto";
rev = "e1a4589e7d3ea14a3352255d04b6f1a418845e5e";
sha256 = "1w90z8r4v96rqx723shjgl8dis12bfmihila20fxid11m8digk5h";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "b90f89a1e7a9c1f6b918820b3daa7f08488c8594";
sha256 = "1bnvvk2z6wlmh39wza9cdf81nbyjfssdh86iywnnpxa7n9lg9dxq";
};
}
{
goPackagePath = "golang.org/x/text";
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
rev = "4ee4af566555f5fbe026368b75596286a312663a";
sha256 = "1zybf6nd47fr9vb587yvmzhmkzf2p58g9q5bz4q5mzpnz22ski3a";
};
}
]

3
pkgs/tools/misc/ipxe/default.nix
View File

@ -5,8 +5,7 @@
let
date = "20190318";
rev = "ebf2eaf515e46abd43bc798e7e4ba77bfe529218";
targets = [
"bin-x86_64-efi/ipxe.efi"
targets = (lib.optional stdenv.isx86_64 "bin-x86_64-efi/ipxe.efi") ++ [
"bin/ipxe.dsk"
"bin/ipxe.usb"
"bin/ipxe.iso"

25
pkgs/tools/misc/zabbixctl/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
pname = "zabbixctl";
version = "unstable-2019-07-06";
goPackagePath = "github.com/kovetskiy/zabbixctl";
src = fetchFromGitHub {
owner = "kovetskiy";
repo = pname;
rev = "f2e856b7ab7d8ff9f494fe9f481bbaef18ea6ff7";
sha256 = "1lr3g9h3aa2px2kh5b2qcpj3aqyhqwq7kj1s9wifgmri9q7fsdzy";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "Most effective way for operating in Zabbix Server";
homepage = "https://github.com/kovetskiy/zabbixctl";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ mmahut ];
};
}

111
pkgs/tools/misc/zabbixctl/deps.nix generated Normal file
View File

@ -0,0 +1,111 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
[
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005";
sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6";
};
}
{
goPackagePath = "github.com/jinzhu/configor";
fetch = {
type = "git";
url = "https://github.com/jinzhu/configor";
rev = "9064de4b2535f218bde55dc8de50a3904ef800d0";
sha256 = "13wd7s2kff3s0bz5mi0m2zcz1r8mwnwhd944gxymzkwij71lhasn";
};
}
{
goPackagePath = "github.com/kovetskiy/godocs";
fetch = {
type = "git";
url = "https://github.com/kovetskiy/godocs";
rev = "2d9428f80f3442e07f67daf7ba378cd0ff6cfe24";
sha256 = "128dlvxqk31crzl9p3ps0nir724cjzxv4lxpgdvsir0wvfp8f83j";
};
}
{
goPackagePath = "github.com/kovetskiy/lorg";
fetch = {
type = "git";
url = "https://github.com/kovetskiy/lorg";
rev = "9c6042b7edb0c491dd0722fad91e2b5e833d6b43";
sha256 = "0j1cm7mni47vraxnyigc55cq0yxw8zdyjmrq2c7vnm5s4kiia8pi";
};
}
{
goPackagePath = "github.com/kovetskiy/spinner-go";
fetch = {
type = "git";
url = "https://github.com/kovetskiy/spinner-go";
rev = "00597fd24fe0d8079821b68f71d73b0661401752";
sha256 = "19qcpnvs61fsk7xgcj5b6s3zksnkc5rk9n5hx73v9ya7m2k7xr2n";
};
}
{
goPackagePath = "github.com/mattn/go-runewidth";
fetch = {
type = "git";
url = "https://github.com/mattn/go-runewidth";
rev = "703b5e6b11ae25aeb2af9ebb5d5fdf8fa2575211";
sha256 = "0znpyz71gajx3g0j2zp63nhjj2c07g16885vxv4ykwnrfmzbgk4w";
};
}
{
goPackagePath = "github.com/olekukonko/tablewriter";
fetch = {
type = "git";
url = "https://github.com/olekukonko/tablewriter";
rev = "cc27d85e17cec9768d2ac401ea5d619a9628f16d";
sha256 = "1y3pkvypkxjrhlnsv8lcyd0c2q8mn5asfny2zi9j2vs77s5bd9qm";
};
}
{
goPackagePath = "github.com/reconquest/karma-go";
fetch = {
type = "git";
url = "https://github.com/reconquest/karma-go";
rev = "1094651bd246b1685f7b368e099aba6fca9efd8f";
sha256 = "0jiayzxwp0h7skg86q58rh58m2imdg3ng2vzpc2bxiz67lzcpk3r";
};
}
{
goPackagePath = "github.com/simplereach/timeutils";
fetch = {
type = "git";
url = "https://github.com/simplereach/timeutils";
rev = "1a719258b86a08630289b86902ab16817ba641e9";
sha256 = "08mf2j0dk07c9p279ydbrjxbjf113azmq0x8vhf7jvldcgjpw3m6";
};
}
{
goPackagePath = "github.com/zazab/zhash";
fetch = {
type = "git";
url = "https://github.com/zazab/zhash";
rev = "ad45b89afe7af57319ca32f174e4dabeb00c44e4";
sha256 = "16b6f70qwfyg0zvbpk0yj5jx4cv2ggkyiqc5nk8n0165z46i62hs";
};
}
{
goPackagePath = "gopkg.in/mgo.v2";
fetch = {
type = "git";
url = "https://gopkg.in/mgo.v2";
rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5";
sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw";
};
}
{
goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
rev = "51d6538a90f86fe93ac480b35f37b2be17fef232";
sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa";
};
}
]

2
pkgs/tools/security/cowpatty/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Offline dictionary attack against WPA/WPA2 networks";
license = licenses.gpl2;
homepage = http://www.willhackforsushi.com/?page_id=50;
homepage = https://www.willhackforsushi.com/?page_id=50;
maintainers = with maintainers; [ nico202 ];
platforms = platforms.linux;
};

2
pkgs/tools/security/keybase/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHubtchurl
{ stdenv, lib, buildGoPackage, fetchFromGitHub
, AVFoundation, AudioToolbox, ImageIO, CoreMedia
, Foundation, CoreGraphics, MediaToolbox
}:

2
pkgs/tools/security/ossec/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "ossec-client-2.6";
src = fetchurl {
url = http://www.ossec.net/files/ossec-hids-2.6.tar.gz;
url = https://www.ossec.net/files/ossec-hids-2.6.tar.gz;
sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip";
};

2
pkgs/tools/typesetting/djvu2pdf/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Convert DjVu files to PDF files";
homepage = http://0x2a.at/s/projects/djvu2pdf;
homepage = https://0x2a.at/s/projects/djvu2pdf;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.all;
inherit version;

4
pkgs/tools/typesetting/scdoc/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "scdoc-${version}";
version = "1.9.4";
version = "1.9.6";
src = fetchurl {
url = "https://git.sr.ht/~sircmpwn/scdoc/archive/${version}.tar.gz";
sha256 = "00zc3rzj97gscby31djlqyczvqpyhrl66i44czwzmmn7rc5j03m1";
sha256 = "0a2rxn0pihknvyvfvzib42v9c7zfdg8pi95q40fywwjb9clz59c9";
};
postPatch = ''

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

@ -1716,6 +1716,8 @@ in
metabase = callPackage ../servers/metabase { };
mididings = callPackage ../tools/audio/mididings { };
miniserve = callPackage ../tools/misc/miniserve { };
mkspiffs = callPackage ../tools/filesystems/mkspiffs { };
@ -2690,6 +2692,8 @@ in
zabbix-cli = callPackage ../tools/misc/zabbix-cli { };
zabbixctl = callPackage ../tools/misc/zabbixctl { };
zzuf = callPackage ../tools/security/zzuf { };
### DEVELOPMENT / EMSCRIPTEN
@ -10162,6 +10166,8 @@ in
cppdb = callPackage ../development/libraries/cppdb { };
cpp-utilities = callPackage ../development/libraries/cpp-utilities { };
cpp-hocon = callPackage ../development/libraries/cpp-hocon { };
cpp-ipfs-api = callPackage ../development/libraries/cpp-ipfs-api { };

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

@ -16133,7 +16133,7 @@ let
};
propagatedBuildInputs = [ TermReadKey TextAutoformat ];
meta = with stdenv.lib; {
homepage = http://metacpan.org/release/Term-Shell;
homepage = https://metacpan.org/release/Term-Shell;
description = "A simple command-line shell framework";
license = with licenses; [ artistic1 gpl1Plus ];
};

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

@ -835,6 +835,8 @@ in {
slurm = pkgs.slurm;
};
pysmf = callPackage ../development/python-modules/pysmf { };
pyspinel = callPackage ../development/python-modules/pyspinel {};
pyssim = callPackage ../development/python-modules/pyssim { };