From 18774fb82b5f3a2bce5d0aba9fd565c0b3021c0d Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Wed, 27 Sep 2017 18:36:37 -0500 Subject: sqldeveloper: 4.1.1 -> 17.2.0 --- pkgs/development/tools/database/sqldeveloper/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 9f321ee3309..929aeb23e6d 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,12 +1,13 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - name = "sqldeveloper-4.1.1.19.59"; + name = "sqldeveloper-17.2.0.188.1159"; src = requireFile { name = "${name}-no-jre.zip"; url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; - sha256 = "1dbbqlz11zps9w5qvzlcv5rdv43s25c3mbzf8il1px4m2j33y3rv"; + /* Actual direct link (would it be allowed to give that link?): http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-17.2.0.188.1159-no-jre.zip */ + sha256 = "03960705fabc7b3fa98d55a31ee6a17f783b8c8b01462613c6b6a699e8cae4d5"; }; buildInputs = [ makeWrapper unzip ]; -- cgit 1.4.1 From 4b8aa5bd4c3de03e0d0ba76853f80ec341460476 Mon Sep 17 00:00:00 2001 From: André-Patrick Bubel Date: Mon, 2 Oct 2017 01:12:33 +0200 Subject: pythonPackages.MechanicalSoup: 0.4.0 -> 0.7.0 --- .../python-modules/MechanicalSoup/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 24 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/MechanicalSoup/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix new file mode 100644 index 00000000000..a022fd9fc41 --- /dev/null +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -0,0 +1,23 @@ +{ fetchPypi, buildPythonPackage, lib +, requests, beautifulsoup4, six }: + + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "MechanicalSoup"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wh93rml446ipx603n5z5i5bpan46pzliq6sw76d0ms9w7w2658d"; + }; + + propagatedBuildInputs = [ requests beautifulsoup4 six ]; + + meta = with lib; { + description = "A Python library for automating interaction with websites"; + homepage = https://github.com/hickford/MechanicalSoup; + license = licenses.mit; + maintainers = [ maintainers.jgillich ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c9cffd3d3a..7c161fef656 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11625,25 +11625,7 @@ in { }; }); - MechanicalSoup = buildPythonPackage rec { - name = "MechanicalSoup-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/MechanicalSoup/${name}.zip"; - sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd"; - }; - - propagatedBuildInputs = with self; [ requests beautifulsoup4 six ]; - - meta = { - description = "A Python library for automating interaction with websites"; - homepage = https://github.com/hickford/MechanicalSoup; - license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; - }; - }; - + MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup/default.nix { }; meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; -- cgit 1.4.1 From 4e36cce39ba3b0b7f38db7352946cf162e518d73 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 7 Oct 2017 18:12:00 -0300 Subject: libmatroska: 1.4.7 -> 1.4.8 --- pkgs/development/libraries/libmatroska/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 9ad959ae22e..764f4442e6c 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.7"; + name = "libmatroska-1.4.8"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "1yi5cnv13nhl27xyqayd5l3sf0j3swfj3apzibv71yg9pariwi26"; + url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; + sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From d49181676b90cd9a1b3302436c0c2a6b8504680c Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sat, 7 Oct 2017 18:12:29 -0300 Subject: mkvtoolnix: 15.0.0 -> 16.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 442e9d8eeb3..2d7f7144f5f 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "15.0.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "06n0hbp484zpsjvnzp6p0nzzssym3illxdicn3y1jf8gy971rxi0"; + sha256 = "0zdmjp0f7sh0bkaj0ls4sy4sg9qdq9ycrl18hlkafnj9xnbijgnn"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; -- cgit 1.4.1 From 2d903b8da2f2a316fb71eec5b24dfce83880a665 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Wed, 27 Sep 2017 13:30:29 +0000 Subject: firefox: add Kerberos support --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 3 +++ pkgs/applications/networking/browsers/firefox/common.nix | 6 +++++- pkgs/applications/networking/browsers/firefox/packages.nix | 1 + pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index f59cb402720..31bc01ea14a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -16,6 +16,7 @@ , gstreamer , gtk2 , gtk3 +, kerberos , libX11 , libXScrnSaver , libxcb @@ -100,6 +101,7 @@ stdenv.mkDerivation { gstreamer gtk2 gtk3 + kerberos libX11 libXScrnSaver libXcomposite @@ -168,6 +170,7 @@ stdenv.mkDerivation { ''; passthru.ffmpegSupport = true; + passthru.gssSupport = true; passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1b72f9e18c3..cc7927fdc54 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -19,6 +19,7 @@ , pulseaudioSupport ? true, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base , gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook +, gssSupport ? true, kerberos ## privacy-related options @@ -72,7 +73,8 @@ stdenv.mkDerivation (rec { ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] - ++ lib.optional gtk3Support gtk3; + ++ lib.optional gtk3Support gtk3 + ++ lib.optional gssSupport kerberos; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -155,6 +157,7 @@ stdenv.mkDerivation (rec { ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" ++ flag ffmpegSupport "ffmpeg" + ++ flag gssSupport "negotiateauth" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ flag webrtcSupport "webrtc" ++ flag geolocationSupport "mozril-geoloc" @@ -219,6 +222,7 @@ stdenv.mkDerivation (rec { gtk = gtk2; inherit nspr; inherit ffmpegSupport; + inherit gssSupport; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; } // overrides) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4b332214041..d9c55bb8768 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -113,6 +113,7 @@ in rec { } // commonAttrs) { stdenv = overrideCC stdenv gcc5; ffmpegSupport = false; + gssSupport = false; }; tor-browser-7-0 = common (rec { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2413f1cfdca..7a7d1368cb2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -9,6 +9,7 @@ , esteidfirefoxplugin , vlc_npapi , libudev +, kerberos }: ## configurability of the wrapper itself @@ -25,6 +26,7 @@ let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; + gssSupport = browser.gssSupport or false; jre = cfg.jre or false; icedtea = cfg.icedtea or false; @@ -46,6 +48,7 @@ let ++ lib.optional (cfg.enableVLC or false) vlc_npapi ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash -- cgit 1.4.1 From 6c087b94611a7628d5b1794be85c718900397c82 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 11:26:32 +0300 Subject: jetbrains-jdk: 970.2 -> 1036.1 --- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index e0aa815e4dc..aa3f49ca4d9 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,13 +7,13 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b970.2"; + version = "152b1036.1"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "0i2cqjfab91kr618z88nb5g9yg60j5z08wjl0nlvcmpvg2z6va0m"; + sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; } else abort "unsupported system: ${stdenv.system}"; -- cgit 1.4.1 From cbdc72b6f112267662265c83895c5b42c5fa7da7 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:47:13 +0300 Subject: jetbrains.clion: 2017.2.2 -> 2017.2.3 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 65721361cd6..f39aef5e1d6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -219,12 +219,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.2.2"; /* updated by script */ + version = "2017.2.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1rnncii7z44186jv9xl3ax179ws9wfwd6yndyf9pvnpcd4jcs6d0"; /* updated by script */ + sha256 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml -- cgit 1.4.1 From b9ce5b3f082ef3ab06fbbf6e458c22ba82f3187d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:47:51 +0300 Subject: jetbrains.gogland: 172.3968.45-> 173.2696.28 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f39aef5e1d6..07492192343 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -245,12 +245,12 @@ in gogland = buildGogland rec { name = "gogland-${version}"; - version = "172.3968.45"; /* updated by script */ + version = "173.2696.28"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0nk9g28l414yp5ldyx1yl38qpp9s1pxkfxfwmw9yvlff3bi0kkyw"; /* updated by script */ + sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */ }; wmClass = "jetbrains-gogland"; update-channel = "gogland_1.0_EAP"; -- cgit 1.4.1 From 7155b8c27d27a6846b69a8ac02179b8bdb7d9797 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:48:29 +0300 Subject: jetbrains.idea-community: 2017.2.4 -> 2017.2.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 07492192343..14a7d55b036 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -258,12 +258,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2017.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "179nqzgbb76pyr48faca6k69v32m5kvx66i2apih95g54sd1xgva"; /* updated by script */ + sha256 = "01p63wsy60icy4673ci435rmzpjfkyz7a8w413vw45i2bm76skhr"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; -- cgit 1.4.1 From f8103e7226b180c3599a16df95675284b173a370 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:48:56 +0300 Subject: jetbrains.idea-ultimate: 2017.2.4 -> 2017.2.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 14a7d55b036..49377620729 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -271,12 +271,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2017.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1qwqk1r42llh8py0w2iq4w1ks3ipzsxkbdz0zkrd1572zngpk90m"; /* updated by script */ + sha256 = "0pp49nck1cad6pz81bd95v4v55vmnvj7cbdzybmldglka1afqjb6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; -- cgit 1.4.1 From c0ec6d9d21f9bc8c6281bd5d41650adb30902fae Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 12 Oct 2017 15:49:16 +0300 Subject: jetbrains.rider: 2017.1.1 -> 2017.1.2 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 49377620729..b18b27d9c2c 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -323,12 +323,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2017.1.1"; /* updated by script */ + version = "2017.1.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1h6p847izddard3227ifg3q5klwvdfixir63i6adkd2fvsqn5935"; /* updated by script */ + sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "rider_2017_1"; -- cgit 1.4.1 From 843e0992ca44be86cd7ca97f337bdd55a91c1655 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 10 Oct 2017 12:24:30 -0400 Subject: Partition all-cabal-hashes into case-insensitive-safe components. OS X by default has a case-insensitive filesystem, and fetching all-cabal-hashes there fails due to a hash mismatch caused by package pairs like compactable and Compactable. This partitions the package set such that each partition contains no equivalent-up-to-case pairs. --- pkgs/data/misc/hackage/default.nix | 38 ++++- .../data/misc/hackage/partition-all-cabal-hashes.c | 190 +++++++++++++++++++++ .../haskell-modules/make-package-set.nix | 19 ++- 3 files changed, 236 insertions(+), 11 deletions(-) create mode 100644 pkgs/data/misc/hackage/partition-all-cabal-hashes.c (limited to 'pkgs') diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index eddc833da9d..eae7a814674 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,11 +1,33 @@ -{ fetchFromGitHub }: +{ fetchFromGitHub +, stdenv +, pkgconfig +, libarchive +, glib +, # Override this to use a different revision + src-spec ? + { owner = "commercialhaskell"; + repo = "all-cabal-hashes"; + rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; + sha256 = "05jmwsgrk77nz9vvgfbpsps0l320qgjpkr2c9zhkn9sc3d275lfb"; + } +, lib +}: # Use builtins.fetchTarball "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz" # instead if you want the latest Hackage automatically at the price of frequent re-downloads. - -fetchFromGitHub { - owner = "commercialhaskell"; - repo = "all-cabal-hashes"; - rev = "901c2522e6797270f5ded4495b1a529e6c16ef45"; - sha256 = "0wng314y3yn6bbwa5ar254l7p8y99gsvm8ll4z7f3wg77v5fzish"; -} +let partition-all-cabal-hashes = stdenv.mkDerivation + { name = "partition-all-cabal-hashes"; + src = ./partition-all-cabal-hashes.c; + unpackPhase = "true"; + buildInputs = [ pkgconfig libarchive glib ]; + buildPhase = + "cc -O3 $(pkg-config --cflags --libs libarchive glib-2.0) $src -o partition-all-cabal-hashes"; + installPhase = + '' + mkdir -p $out/bin + install -m755 partition-all-cabal-hashes $out/bin + ''; + }; +in fetchFromGitHub (src-spec // + { postFetch = "${partition-all-cabal-hashes}/bin/partition-all-cabal-hashes $downloadedFile $out"; + }) diff --git a/pkgs/data/misc/hackage/partition-all-cabal-hashes.c b/pkgs/data/misc/hackage/partition-all-cabal-hashes.c new file mode 100644 index 00000000000..d8c3eca3701 --- /dev/null +++ b/pkgs/data/misc/hackage/partition-all-cabal-hashes.c @@ -0,0 +1,190 @@ +#include +#include +#include +#include +#include +#include +#include + +static char * case_normalize(char * str) { + for (char * iter = str; *iter; ++iter) { + *iter = tolower(*iter); + } + return str; +} + +static gint compare_str(const void * a, const void * b, void * _) { + return strcmp(a, b); +} + +int main(int argc, char ** argv) { + if (argc != 3) { + fprintf(stderr, "Usage: %s TARBALL OUTPUT\n", argv[0]); + return 1; + } + + size_t output_len = strlen(argv[2]); + + /* Switch to standard locale to ensure consistency in case-folding. + */ + setlocale(LC_CTYPE, "C"); + + /* Map from case-normalized package name to a sorted sequence of + * package names in the equivalence class defined by + * case-normalization. + */ + GHashTable * equivalence_classes = + g_hash_table_new(g_str_hash, g_str_equal); + + /* Open up the tarball. + */ + struct archive * ar = archive_read_new(); + if (!ar) { + perror("Allocating archive structure"); + return 1; + } + archive_read_support_filter_gzip(ar); + archive_read_support_format_tar(ar); + if (archive_read_open_filename( ar + , argv[1] + , 10240 + ) == ARCHIVE_FATAL) { + fprintf( stderr + , "Error opening %s: %s\n" + , argv[0] + , archive_error_string(ar) + ); + return 1; + } + + /* Extract the length of the output directory that prefixes all + * tarball entries from the first entry in the tarball. + */ + struct archive_entry * ent; + int err = archive_read_next_header(ar, &ent); + if (err != ARCHIVE_OK) { + if (err == ARCHIVE_EOF) { + fprintf( stderr + , "No entries in %s, surely this is an error!\n" + , argv[1] + ); + } else { + fprintf( stderr + , "Error reading entry from %s: %s\n" + , argv[1] + , archive_error_string(ar) + ); + } + return 1; + } + const char * path = archive_entry_pathname(ent); + /* Number of characters from the start of the path name until after + * the slash after the leading directory. + */ + size_t prefix_len = strchr(path, '/') - path + 1; + + /* Extract each entry to the right partition. + */ + do { + path = archive_entry_pathname(ent) + prefix_len; + const char * pkg_end = strchr(path, '/'); + if (!pkg_end) + /* If there is no second slash, then this is either just the entry + * corresponding to the root or some non-package file (e.g. + * travis.yml). In either case, we don't care. + */ + continue; + + /* Find our package in the equivalence class map. + */ + char * pkg_name = g_strndup(path, pkg_end - path); + char * pkg_normalized = + case_normalize(g_strndup(path, pkg_end - path)); + GSequence * pkg_class = + g_hash_table_lookup(equivalence_classes, pkg_normalized); + gint partition_num; + if (!pkg_class) { + /* We haven't seen any packages with this normalized name yet, + * so we need to initialize the sequence and add it to the map. + */ + pkg_class = g_sequence_new(NULL); + g_sequence_append(pkg_class, pkg_name); + g_hash_table_insert( equivalence_classes + , pkg_normalized + , pkg_class + ); + partition_num = 1; + } else { + g_free(pkg_normalized); + /* Find the package name in the equivalence class */ + GSequenceIter * pkg_iter = + g_sequence_search( pkg_class + , pkg_name + , compare_str + , NULL + ); + if (!g_sequence_iter_is_end(pkg_iter)) { + /* If there are any packages after this one in the list, bail + * out. In principle we could solve this by moving them up to + * the next partition, but so far I've never seen any github + * tarballs out of order so let's save ourselves the work + * until we know we need it. + */ + fprintf( stderr + , "Out of order github tarball: %s is after %s\n" + , pkg_name + , (char *) g_sequence_get(pkg_iter) + ); + return 1; + } + pkg_iter = g_sequence_iter_prev(pkg_iter); + if (strcmp( g_sequence_get(pkg_iter) + , pkg_name + ) != 0) { + /* This package doesn't have the same name as the one right + * before where it should be in the sequence, which means it's + * new and needs to be added to the sequence. + * + * !!! We need to change this to use g_sequence_insert_before + * if we ever get an out-of-order github tarball, see comment + * after the check for !g_sequence_iter_is_end(pkg_iter). + */ + pkg_iter = g_sequence_append(pkg_class, pkg_name); + } else { + g_free(pkg_name); + } + /* Get the partition number, starting with 1. + */ + partition_num = g_sequence_iter_get_position(pkg_iter) + 1; + } + + /* Set the destination path. + * The 3 below is for the length of /#/, the partition number part + * of the path. If we have more than 9 partitions, we deserve to + * segfault. The 1 at the end is for the trailing null. + */ + char * dest_path = g_malloc(output_len + 3 + strlen(path) + 1); + sprintf(dest_path, "%s/%d/%s", argv[2], partition_num, path); + archive_entry_set_pathname(ent, dest_path); + + if (archive_read_extract(ar, ent, 0) != ARCHIVE_OK) { + fprintf( stderr + , "Error extracting entry %s from %s: %s\n" + , dest_path + , argv[1] + , archive_error_string(ar) + ); + return 1; + } + } while ((err = archive_read_next_header(ar, &ent)) == ARCHIVE_OK); + if (err != ARCHIVE_EOF) { + fprintf( stderr + , "Error reading entry from %s: %s\n" + , argv[1] + , archive_error_string(ar) + ); + return 1; + } + + return 0; +} diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index ff5be894b92..d84167008d9 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -118,10 +118,23 @@ let ''; }; - hackage2nix = name: version: self.haskellSrc2nix { + all-cabal-hashes-component = name: import (pkgs.runCommand "all-cabal-hashes-component-${name}.nix" {} + '' + set +o pipefail + for component in ${all-cabal-hashes}/*; do + if ls $component | grep -q ${name}; then + echo "builtins.storePath $component" > $out + exit 0 + fi + done + echo "${name} not found in any all-cabal-hashes component, are you sure it's in hackage?" >&2 + exit 1 + ''); + + hackage2nix = name: version: let component = all-cabal-hashes-component name; in self.haskellSrc2nix { name = "${name}-${version}"; - sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${all-cabal-hashes}/${name}/${version}/${name}.json")''; - src = "${all-cabal-hashes}/${name}/${version}/${name}.cabal"; + sha256 = ''$(sed -e 's/.*"SHA256":"//' -e 's/".*$//' "${component}/${name}/${version}/${name}.json")''; + src = "${component}/${name}/${version}/${name}.cabal"; }; in package-set { inherit pkgs stdenv callPackage; } self // { -- cgit 1.4.1 From 8dcaa5b313165d0acb3860cab97ece62e8421162 Mon Sep 17 00:00:00 2001 From: Rémi Desgrange Date: Wed, 11 Oct 2017 18:06:20 +0200 Subject: postgis: add v2.4.0 Add postgis 2.4.0 doesn't remove v2.3.1. There are some big change in 2.4 that people may don't want. see https://postgis.net/docs/release_notes.html#idm41021 fix test call modify following recommandation of lsix --- nixos/release.nix | 1 + nixos/tests/postgis.nix | 10 +++------- pkgs/development/libraries/postgis/default.nix | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/nixos/release.nix b/nixos/release.nix index ee706ff986d..4060e5df4ec 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -303,6 +303,7 @@ in rec { #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; + tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 1dba5c363c0..f6ce3fe38ed 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,15 +9,11 @@ import ./make-test.nix ({ pkgs, ...} : { { pkgs, config, ... }: { - services.postgresql = let mypg = pkgs.postgresql95; in { + services.postgresql = let mypg = pkgs.postgresql100; in { enable = true; package = mypg; - extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_2_1 ]; - initialScript = pkgs.writeText "postgresql-init.sql" - '' - CREATE ROLE postgres WITH superuser login createdb; - ''; - }; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + }; }; }; diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 2ba5a262e22..bdf537f4375 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -109,4 +109,30 @@ in rec { ''; }); + v_2_4_0 = pgDerivationBaseNewer.merge ( fix : { + version = "2.4.0"; + sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + builtInputs = [gdal json_c pkgconfig]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + }); + + } -- cgit 1.4.1 From 6f38c8e182efc11549ba9ea6d69b8792ef963668 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 13 Oct 2017 14:47:23 +0200 Subject: cli-visualizer: fix --- pkgs/applications/misc/cli-visualizer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 860a1d186f7..fd88ea61ad8 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }: +{ stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { version = "1.5"; @@ -15,13 +15,15 @@ stdenv.mkDerivation rec { sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp ''; - buildInputs = [ fftw ncurses libpulseaudio ]; + buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ]; buildFlags = [ "ENABLE_PULSE=1" ]; installPhase = '' mkdir -p $out/bin cp build/vis $out/bin/vis + # See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075 + wrapProgram $out/bin/vis --set TERM rxvt-256color ''; meta = { -- cgit 1.4.1 From 52bedcb14b303a3f5550950cdf8f7d8281b9ea10 Mon Sep 17 00:00:00 2001 From: Gleb Peregud Date: Wed, 11 Oct 2017 21:52:07 +0200 Subject: pgadmin3: 1.22.1 -> 1.22.2 Also include Debian patch https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344 which fixes segfault at start --- pkgs/applications/misc/pgadmin/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 15313befb62..889f516f00b 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: +{ stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { name = "pgadmin3-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"; - sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki"; + url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; + sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; }; enableParallelBuilding = true; buildInputs = [ postgresql wxGTK openssl zlib ]; + patches = [ + (fetchpatch { + sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk"; + name = "843344.patch"; + url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344"; + }) + ]; + preConfigure = '' substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" ''; configureFlags = [ + "--with-pgsql=${postgresql}" "--with-libxml2=${libxml2.dev}" "--with-libxslt=${libxslt.dev}" ]; -- cgit 1.4.1 From 51f1c635e679fdadead32e5aec464b28c254d099 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 7 Apr 2017 17:40:04 +0800 Subject: hyperv-daemons: init at current linux kernel version --- pkgs/os-specific/linux/hyperv-daemons/default.nix | 109 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 111 insertions(+) create mode 100644 pkgs/os-specific/linux/hyperv-daemons/default.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix new file mode 100644 index 00000000000..91b3c25bd31 --- /dev/null +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, python, kernel, makeWrapper, writeText }: + +let + daemons = stdenv.mkDerivation rec { + name = "hyperv-daemons-bin-${version}"; + inherit (kernel) src version; + + nativeBuildInputs = [ makeWrapper ]; + + # as of 4.9 compilation will fail due to -Werror=format-security + hardeningDisable = [ "format" ]; + + preConfigure = '' + cd tools/hv + ''; + + installPhase = '' + runHook preInstall + + for f in fcopy kvp vss ; do + install -Dm755 hv_''${f}_daemon -t $out/bin + done + + install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin + + # I don't know why this isn't being handled automatically by fixupPhase + substituteInPlace $out/bin/lsvmbus \ + --replace '/usr/bin/env python' ${python.interpreter} + + runHook postInstall + ''; + + postFixup = '' + # kvp needs to be able to find the script(s) + wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin + ''; + }; + + service = bin: title: check: + writeText "hv-${bin}.service" '' + [Unit] + Description=Hyper-V ${title} daemon + ConditionVirtualization=microsoft + ${lib.optionalString (check != "") '' + ConditionPathExists=/dev/vmbus/${check} + ''} + [Service] + ExecStart=@out@/hv_${bin}_daemon -n + Restart=on-failure + PrivateTmp=true + Slice=hyperv.slice + + [Install] + WantedBy=hyperv-daemons.target + ''; + +in stdenv.mkDerivation rec { + name = "hyperv-daemons-${version}"; + + inherit (kernel) version; + + # we just stick the bins into out as well as it requires "out" + outputs = [ "bin" "lib" "out" ]; + + phases = [ "installPhase" ]; + + buildInputs = [ daemons ]; + + installPhase = '' + system=$lib/lib/systemd/system + + mkdir -p $system + + cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service + cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service + cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service + + cat > $system/hyperv-daemons.target < Date: Thu, 27 Apr 2017 16:26:00 +0800 Subject: nix-upgrade-scripts: init at 0.0.4 --- .../nix-upgrade-scripts/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/package-management/nix-upgrade-scripts/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/package-management/nix-upgrade-scripts/default.nix b/pkgs/tools/package-management/nix-upgrade-scripts/default.nix new file mode 100644 index 00000000000..d80e26a69fd --- /dev/null +++ b/pkgs/tools/package-management/nix-upgrade-scripts/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, nix }: + +stdenv.mkDerivation rec { + name = "nix-upgrade-scripts-${version}"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "peterhoeg"; + repo = "nix-upgrade-scripts"; + rev = "v${version}"; + sha256 = "13v91nniwrs1fr92msrq6sq7vy1whrlxqd1ll4q3p1nrnbzpnxkn"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -r bin lib $out/ + for f in $out/bin/* ; do + substituteInPlace $f \ + --replace '/usr/bin/env nix-shell' ${nix}/bin/nix-shell + done + chmod +x $out/bin/* + ''; + + meta = with stdenv.lib; { + description = "Scripts for making package upgrades easier"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67cce24decf..f01d1d97d31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19146,6 +19146,8 @@ with pkgs; nix-serve = callPackage ../tools/package-management/nix-serve { }; + nix-upgrade-scripts = callPackages ../tools/package-management/nix-upgrade-scripts { }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; -- cgit 1.4.1 From fde0bad57796e29337e8a1f1dcbb0164f5e56b1c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 6 Jun 2017 16:17:03 +0800 Subject: amarok-kf5: init at 2.8.91-20170228 --- pkgs/applications/audio/amarok/kf5.nix | 37 ++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/audio/amarok/kf5.nix (limited to 'pkgs') diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix new file mode 100644 index 00000000000..a96aa3ed65d --- /dev/null +++ b/pkgs/applications/audio/amarok/kf5.nix @@ -0,0 +1,37 @@ +{ mkDerivation, fetchgit, lib +, extra-cmake-modules, kdoctools +, qca-qt5, qjson, qtscript, qtwebkit +, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor +, phonon, plasma-framework, threadweaver +, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras +}: + +let + pname = "amarok"; + version = "2.8.91-20170228"; + +in mkDerivation { + name = "${pname}-${version}"; + + src = fetchgit { + url = git://anongit.kde.org/amarok.git; + # go back to the KDE mirror when kf5 is merged into master + # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; + sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedBuildInputs = [ + qca-qt5 qjson qtscript qtwebkit + kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor + phonon plasma-framework threadweaver + curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras + ]; + enableParallelBuilding = true; + + meta = with lib; { + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01d1d97d31..565b17984ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13631,6 +13631,8 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; + amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { }; + AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; -- cgit 1.4.1 From 178a96f99be69a173669254295d5a06732e7a906 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 5 Feb 2017 15:36:41 +0800 Subject: firewalld: init at 0.4.4.4 Includes systemd module. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/firewalld.nix | 53 ++++++++++++++ pkgs/os-specific/linux/firewalld/default.nix | 94 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 150 insertions(+) create mode 100644 nixos/modules/services/networking/firewalld.nix create mode 100644 pkgs/os-specific/linux/firewalld/default.nix (limited to 'pkgs') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5e6b42dea54..1eef781a31d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -437,6 +437,7 @@ ./services/networking/firefox/sync-server.nix ./services/networking/fireqos.nix ./services/networking/firewall.nix + ./services/networking/firewalld.nix ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix diff --git a/nixos/modules/services/networking/firewalld.nix b/nixos/modules/services/networking/firewalld.nix new file mode 100644 index 00000000000..02d694af390 --- /dev/null +++ b/nixos/modules/services/networking/firewalld.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.firewalld; + +in { + ###### interface + + options = { + networking.firewalld = { + enable = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable firewalld. firewalld is a high-level Linux-based packet + filtering framework intended for desktop use cases. + + This conflicts with the standard networking firewall, so make sure to + disable it before using firewalld. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + assertions = [{ + assertion = config.networking.firewall.enable == false; + message = "You can not use firewalld with services.networking.firewall."; + }]; + + environment.etc = [ + { source = "${pkgs.firewalld}/etc/firewalld"; + target = "firewalld"; } + ]; + + services = { + dbus.packages = with pkgs; [ firewalld ]; + }; + + systemd = { + packages = with pkgs; [ firewalld ]; + + services.firewalld = { + wantedBy = [ "multi-user.target" ]; + }; + }; + }; +} diff --git a/pkgs/os-specific/linux/firewalld/default.nix b/pkgs/os-specific/linux/firewalld/default.nix new file mode 100644 index 00000000000..6b2e5803875 --- /dev/null +++ b/pkgs/os-specific/linux/firewalld/default.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, fetchFromGitHub +, autoreconfHook, docbook_xml_dtd_42, docbook_xsl, gettext, python3Packages +, intltool, libxslt, dbus, pkgconfig, iptables, ebtables, ipset, glib, kmod +, withKde ? true, plasma-nm ? null +}: + +let + slip = python3Packages.buildPythonPackage rec { + name = "python-slip-${version}"; + version = "0.6.4"; + + src = fetchFromGitHub { + owner = "nphilipp"; + repo = "python-slip"; + rev = name; + sha256 = "07zyxy62738dzsvifm1241k0zx5l3xl6s5yfhyn88wc59fa8p570"; + }; + + doCheck = false; # no tests + + buildPhase = '' + runHook preBuild + export PREFIX=$out + make + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + make install + runHook postInstall + ''; + + }; + +in python3Packages.buildPythonApplication rec { + name = "firewalld-${version}"; + version = "0.4.4.4"; + + src = fetchFromGitHub { + owner = "t-woerner"; + repo = "firewalld"; + rev = "v${version}"; + sha256 = "048flfcsi3ibp124k01hhf9bnbpyi3b92jgc96fhfvw6ns2l48qc"; + }; + + doCheck = false; # no tests + + propagatedBuildInputs = with python3Packages; [ + dbus + decorator + pygobject3 + pyqt5 + six + slip + ]; + + buildInputs = [ + autoreconfHook pkgconfig + docbook_xml_dtd_42 docbook_xsl gettext intltool libxslt + dbus ebtables glib ipset iptables + ]; + + preConfigure = '' + patchShebangs . + + substituteInPlace doc/xml/*.xml \ + --replace "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" + + substituteInPlace src/firewall-applet \ + --replace /usr/bin/kde5-nm-connection-editor ${lib.getBin plasma-nm}/bin/kde5-nm-connection-editor + + export MODINFO=${kmod}/bin/modinfo + export MODPROBE=${kmod}/bin/modprobe + export RMMOD=${kmod}/bin/rmmod + ''; + + buildPhase = '' + ./autogen.sh --prefix=$out + make + ''; + + installPhase = '' + make install $out + cp -r config/{helpers,icmptypes,ipsets,services,zones} $out/etc/firewalld + ''; + + meta = with lib; { + description = "A service daemon with D-Bus interface"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 565b17984ce..037e133a7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12212,6 +12212,8 @@ with pkgs; firejail = callPackage ../os-specific/linux/firejail {}; + firewalld = callPackage ../os-specific/linux/firewalld {}; + fnotifystat = callPackage ../os-specific/linux/fnotifystat { }; forkstat = callPackage ../os-specific/linux/forkstat { }; -- cgit 1.4.1 From 3ba45dd220019af6a230282e884415f35758cb9d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 22 Sep 2017 18:48:13 +0800 Subject: freetds: 0.91 -> 1.00.62 --- pkgs/development/libraries/freetds/default.nix | 39 +++++++++++++------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 2e06c3bbec7..faf20bda4d9 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,34 +1,35 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, autoreconfHook, pkgconfig +, openssl , odbcSupport ? false, unixODBC ? null }: assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { - name = "freetds-0.91"; + name = "freetds-${version}"; + version = "1.00.62"; src = fetchurl { - url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz"; - sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; + url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; + sha256 = "10d1rjflp3gkmgk5zlv2ck23p0fgpxrgf1jhfv9pvy3q02h9ldis"; }; - hardeningDisable = [ "format" ]; + configureFlags = [ + "--with-tdsver=7.0" + ]; - buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; + buildInputs = [ + openssl + ] ++ stdenv.lib.optional odbcSupport unixODBC; - configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - doDist = true; + enableParallelBuilding = true; - distPhase = '' - touch $out/include/tds.h - touch $out/lib/libtds.a - ''; - - meta = { - description = - "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = http://www.freetds.org; - license = "lgpl"; - platforms = stdenv.lib.platforms.all; + meta = with stdenv.lib; { + description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; + homepage = http://www.freetds.org; + license = licenses.lgpl2; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; }; } -- cgit 1.4.1 From a7a19401619eb667f784044e461ac9cf87b070b0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 17 Oct 2016 18:02:53 +0800 Subject: skeleton --- pkgs/build-support/make-dbusservice/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pkgs/build-support/make-dbusservice/default.nix (limited to 'pkgs') diff --git a/pkgs/build-support/make-dbusservice/default.nix b/pkgs/build-support/make-dbusservice/default.nix new file mode 100644 index 00000000000..44ed6dcda67 --- /dev/null +++ b/pkgs/build-support/make-dbusservice/default.nix @@ -0,0 +1,16 @@ +{ stdenv }: + +{ name, exec }: + +stdenv.mkDerivation rec { + dbusName = "dbus-${name}.service"; + buildCommand = '' + mkdir -p $out/lib/systemd/user + cat > $out/lib/systemd/user/${dbusName} < Date: Mon, 1 May 2017 16:33:15 +0800 Subject: msmtp: add nonblocking support --- pkgs/applications/networking/msmtp/default.nix | 37 +++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 85e5abdc9b6..74beba7be49 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,11 +1,21 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security -, systemd ? null }: +, systemd ? null, eject ? null }: let tester = "n"; # {x| |p|P|n|s} journal = if stdenv.isLinux then "y" else "n"; + # preferNonBlock = stdenv.isLinux; + preferNonBlock = false; + + nonblock = fetchFromGitHub { + owner = "Stebalien"; + repo = "msmtp-queue"; + rev = "07032a4e4c8ea0d2364641c959db0c60f52423c7"; + sha256 = "0g2aph30007spkdwxljrlr2bliivf9nrdis3d3jvjpx8l6k60rr9"; + }; + in stdenv.mkDerivation rec { name = "msmtp-${version}"; version = "1.6.6"; @@ -20,13 +30,17 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gsasl libidn ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ lib.optional stdenv.isDarwin Security + ++ lib.optionals preferNonBlock [ nonblock eject ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + enableParallelBuilding = true; + configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' + ${lib.optionalString (!preferNonBlock) '' substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \ --replace @msmtp@ $out/bin/msmtp \ --replace @nc@ ${netcat-gnu}/bin/nc \ @@ -36,6 +50,23 @@ in stdenv.mkDerivation rec { substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \ --replace @msmtpq@ $out/bin/msmtpq + ''} + ${lib.optionalString preferNonBlock '' + mkdir -p $out/lib/systemd/user + cp ${nonblock}/msmtp* $out/bin/ + cp ${nonblock}/systemd/* $out/lib/systemd/user + for f in $out/bin/msmtpq* ; do + sed $f -i -r \ + -e 's|^QUEUE_DIR.*|QUEUE_DIR="''${MSMTP_QUEUE:-''${XDG_DATA_HOME:-$HOME/.local/share}/mail.queue}"|' \ + -e 's|^CONFIG.*|CONFIG="''${XDG_CONFIG_HOME:-$HOME/.config}/msmtprc"|' \ + -e 's| flock | ${eject}/bin/flock |' + done + for f in $out/lib/systemd/user/* ; do + substituteInPlace $f \ + --replace /usr/local $out \ + --replace .local/share/mail.queue .cache/msmtp/queue + done + ''} chmod +x $out/bin/* ''; -- cgit 1.4.1 From 15bdbc21f9008561980a471914428ae2875f6cb4 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 8 Mar 2017 22:25:04 +0800 Subject: nvidia-firmware: init at 325.15 --- pkgs/os-specific/linux/firmware/nvidia/default.nix | 66 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/nvidia/default.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/firmware/nvidia/default.nix b/pkgs/os-specific/linux/firmware/nvidia/default.nix new file mode 100644 index 00000000000..810c7bd60cc --- /dev/null +++ b/pkgs/os-specific/linux/firmware/nvidia/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, python2Packages, which, xz }: + +let + extractor = fetchurl { + url = https://raw.githubusercontent.com/imirkin/re-vp2/master/extract_firmware.py; + sha256 = "03dd1il0cjs8xi411pkckkfjga348j0cgd6dix20gd4kwmlvyjqm"; + }; + + chipModel = [ + # gt200 should be nva0 but we don't have those and all nvaX are links to the same files anyway + { chip = "nva3"; model = "gt200"; } + { chip = "nva3"; model = "gt215"; } + { chip = "nva5"; model = "gt216"; } + { chip = "nva8"; model = "gt218"; } + { chip = "nve4"; model = "gk104"; } + { chip = "nve6"; model = "gk106"; } + { chip = "nve7"; model = "gk107"; } + ]; + +in stdenv.mkDerivation rec { + name = "linux-firmware-nvidia-${version}"; + version = "325.15"; + + src = fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"; + sha256 = "0xc7w2ia2fnkn20s6aq1f4ib2ljxmd2931vnrkvl2injzr5hwy9x"; + }; + + phases = [ "installPhase" ]; + + nativeBuildInputs = [ which xz ]; + + installPhase = '' + dir=$out/lib/firmware + ${stdenv.shell} ${src} --extract-only + ${python2Packages.python.interpreter} ${extractor} + + mkdir -p $dir/{nouveau,nvidia} + cp -rd nv* vuc-* $dir/nouveau + + ${stdenv.lib.concatStringsSep "\n" (map (entry: '' + mkdir -p $dir/nvidia/${entry.model} + + ln -rs $dir/nouveau/${entry.chip}_fuc409c $dir/nvidia/${entry.model}/fecs_inst.bin + ln -rs $dir/nouveau/${entry.chip}_fuc409d $dir/nvidia/${entry.model}/fecs_data.bin + ln -rs $dir/nouveau/${entry.chip}_fuc41ac $dir/nvidia/${entry.model}/gpccs_inst.bin + ln -rs $dir/nouveau/${entry.chip}_fuc41ad $dir/nvidia/${entry.model}/gpccs_data.bin + '') chipModel)} + ''; + + meta = with stdenv.lib; { + description = "Binary firmware for nVidia cards"; + longDescription = '' + This package contains proprietary firmware blobs for nVidia graphics cards + up to and including the "Kepler" range. +s + If you card is supported but not handled by this package, please find yours + here https://nouveau.freedesktop.org/wiki/CodeNames/ and let us know. + ''; + homepage = http://nvidia.com; + hydraPlatforms = []; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 037e133a7d0..76435f41ae9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12846,6 +12846,8 @@ with pkgs; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + firmwareLinuxNvidia = callPackage ../os-specific/linux/firmware/nvidia { }; + radeontools = callPackage ../os-specific/linux/radeontools { }; radeontop = callPackage ../os-specific/linux/radeontop { }; -- cgit 1.4.1 From 9bf0e701e9efb127b09a9763d633979da4bc9d35 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 13 Oct 2017 20:20:39 +0800 Subject: kdeconnect: boy scout cleanups --- pkgs/applications/misc/kdeconnect/default.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index e8235642cb2..a95dd6adbce 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -5,6 +5,7 @@ , kcmutils , kconfigwidgets , kdbusaddons +, kdoctools , kiconthemes , ki18n , knotifications @@ -25,25 +26,19 @@ stdenv.mkDerivation rec { }; buildInputs = [ - kcmutils - kconfigwidgets - kdbusaddons - qca-qt5 - ki18n - kiconthemes - knotifications - libfakekey - libXtst - qtx11extras + libfakekey libXtst + ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications + qca-qt5 qtx11extras ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh ]; - homepage = https://community.kde.org/KDEConnect; + homepage = https://community.kde.org/KDEConnect; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ fridh ]; }; - } -- cgit 1.4.1 From cb61845c4a6dfc585a936d364af1be25c9ad781e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Oct 2017 06:31:55 +0000 Subject: ocamlbuild: remove unused arguments --- pkgs/development/tools/ocaml/ocamlbuild/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 5062f53cd71..b6e439e4e17 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4, - ocamlmod, ocamlify, ounit, expect}: +{ stdenv, fetchFromGitHub, ocaml, findlib }: let version = "0.11.0"; in -- cgit 1.4.1 From 5f6d2d15acc001b14bfcd8f14923c697aa90f968 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:16 +0800 Subject: Revert "nvidia-firmware: init at 325.15" This reverts commit 15bdbc21f9008561980a471914428ae2875f6cb4. --- pkgs/os-specific/linux/firmware/nvidia/default.nix | 66 ---------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 68 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/nvidia/default.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/firmware/nvidia/default.nix b/pkgs/os-specific/linux/firmware/nvidia/default.nix deleted file mode 100644 index 810c7bd60cc..00000000000 --- a/pkgs/os-specific/linux/firmware/nvidia/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, python2Packages, which, xz }: - -let - extractor = fetchurl { - url = https://raw.githubusercontent.com/imirkin/re-vp2/master/extract_firmware.py; - sha256 = "03dd1il0cjs8xi411pkckkfjga348j0cgd6dix20gd4kwmlvyjqm"; - }; - - chipModel = [ - # gt200 should be nva0 but we don't have those and all nvaX are links to the same files anyway - { chip = "nva3"; model = "gt200"; } - { chip = "nva3"; model = "gt215"; } - { chip = "nva5"; model = "gt216"; } - { chip = "nva8"; model = "gt218"; } - { chip = "nve4"; model = "gk104"; } - { chip = "nve6"; model = "gk106"; } - { chip = "nve7"; model = "gk107"; } - ]; - -in stdenv.mkDerivation rec { - name = "linux-firmware-nvidia-${version}"; - version = "325.15"; - - src = fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}.run"; - sha256 = "0xc7w2ia2fnkn20s6aq1f4ib2ljxmd2931vnrkvl2injzr5hwy9x"; - }; - - phases = [ "installPhase" ]; - - nativeBuildInputs = [ which xz ]; - - installPhase = '' - dir=$out/lib/firmware - ${stdenv.shell} ${src} --extract-only - ${python2Packages.python.interpreter} ${extractor} - - mkdir -p $dir/{nouveau,nvidia} - cp -rd nv* vuc-* $dir/nouveau - - ${stdenv.lib.concatStringsSep "\n" (map (entry: '' - mkdir -p $dir/nvidia/${entry.model} - - ln -rs $dir/nouveau/${entry.chip}_fuc409c $dir/nvidia/${entry.model}/fecs_inst.bin - ln -rs $dir/nouveau/${entry.chip}_fuc409d $dir/nvidia/${entry.model}/fecs_data.bin - ln -rs $dir/nouveau/${entry.chip}_fuc41ac $dir/nvidia/${entry.model}/gpccs_inst.bin - ln -rs $dir/nouveau/${entry.chip}_fuc41ad $dir/nvidia/${entry.model}/gpccs_data.bin - '') chipModel)} - ''; - - meta = with stdenv.lib; { - description = "Binary firmware for nVidia cards"; - longDescription = '' - This package contains proprietary firmware blobs for nVidia graphics cards - up to and including the "Kepler" range. -s - If you card is supported but not handled by this package, please find yours - here https://nouveau.freedesktop.org/wiki/CodeNames/ and let us know. - ''; - homepage = http://nvidia.com; - hydraPlatforms = []; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76435f41ae9..037e133a7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12846,8 +12846,6 @@ with pkgs; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; - firmwareLinuxNvidia = callPackage ../os-specific/linux/firmware/nvidia { }; - radeontools = callPackage ../os-specific/linux/radeontools { }; radeontop = callPackage ../os-specific/linux/radeontop { }; -- cgit 1.4.1 From d81601065d57965767dd87590d93295e13e8fa49 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:29 +0800 Subject: Revert "msmtp: add nonblocking support" This reverts commit 5f29e9fdbfe0ac069c0348084ca169c59cda3ddc. --- pkgs/applications/networking/msmtp/default.nix | 37 +++----------------------- 1 file changed, 3 insertions(+), 34 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 74beba7be49..85e5abdc9b6 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,21 +1,11 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig , openssl, netcat-gnu, gnutls, gsasl, libidn, Security -, systemd ? null, eject ? null }: +, systemd ? null }: let tester = "n"; # {x| |p|P|n|s} journal = if stdenv.isLinux then "y" else "n"; - # preferNonBlock = stdenv.isLinux; - preferNonBlock = false; - - nonblock = fetchFromGitHub { - owner = "Stebalien"; - repo = "msmtp-queue"; - rev = "07032a4e4c8ea0d2364641c959db0c60f52423c7"; - sha256 = "0g2aph30007spkdwxljrlr2bliivf9nrdis3d3jvjpx8l6k60rr9"; - }; - in stdenv.mkDerivation rec { name = "msmtp-${version}"; version = "1.6.6"; @@ -30,17 +20,13 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ openssl gnutls gsasl libidn ] - ++ lib.optional stdenv.isDarwin Security - ++ lib.optionals preferNonBlock [ nonblock eject ]; + ++ stdenv.lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - enableParallelBuilding = true; - configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; postInstall = '' - ${lib.optionalString (!preferNonBlock) '' substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \ --replace @msmtp@ $out/bin/msmtp \ --replace @nc@ ${netcat-gnu}/bin/nc \ @@ -50,23 +36,6 @@ in stdenv.mkDerivation rec { substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \ --replace @msmtpq@ $out/bin/msmtpq - ''} - ${lib.optionalString preferNonBlock '' - mkdir -p $out/lib/systemd/user - cp ${nonblock}/msmtp* $out/bin/ - cp ${nonblock}/systemd/* $out/lib/systemd/user - for f in $out/bin/msmtpq* ; do - sed $f -i -r \ - -e 's|^QUEUE_DIR.*|QUEUE_DIR="''${MSMTP_QUEUE:-''${XDG_DATA_HOME:-$HOME/.local/share}/mail.queue}"|' \ - -e 's|^CONFIG.*|CONFIG="''${XDG_CONFIG_HOME:-$HOME/.config}/msmtprc"|' \ - -e 's| flock | ${eject}/bin/flock |' - done - for f in $out/lib/systemd/user/* ; do - substituteInPlace $f \ - --replace /usr/local $out \ - --replace .local/share/mail.queue .cache/msmtp/queue - done - ''} chmod +x $out/bin/* ''; -- cgit 1.4.1 From 85e7bbb2854fc76d895ff087629ae28e65373f48 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:41 +0800 Subject: Revert "skeleton" This reverts commit a7a19401619eb667f784044e461ac9cf87b070b0. --- pkgs/build-support/make-dbusservice/default.nix | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 pkgs/build-support/make-dbusservice/default.nix (limited to 'pkgs') diff --git a/pkgs/build-support/make-dbusservice/default.nix b/pkgs/build-support/make-dbusservice/default.nix deleted file mode 100644 index 44ed6dcda67..00000000000 --- a/pkgs/build-support/make-dbusservice/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv }: - -{ name, exec }: - -stdenv.mkDerivation rec { - dbusName = "dbus-${name}.service"; - buildCommand = '' - mkdir -p $out/lib/systemd/user - cat > $out/lib/systemd/user/${dbusName} < Date: Sat, 14 Oct 2017 14:40:48 +0800 Subject: Revert "freetds: 0.91 -> 1.00.62" This reverts commit 3ba45dd220019af6a230282e884415f35758cb9d. --- pkgs/development/libraries/freetds/default.nix | 39 +++++++++++++------------- 1 file changed, 19 insertions(+), 20 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index faf20bda4d9..2e06c3bbec7 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -1,35 +1,34 @@ -{ stdenv, fetchurl, autoreconfHook, pkgconfig -, openssl +{ stdenv, fetchurl , odbcSupport ? false, unixODBC ? null }: assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { - name = "freetds-${version}"; - version = "1.00.62"; + name = "freetds-0.91"; src = fetchurl { - url = "http://www.freetds.org/files/stable/${name}.tar.bz2"; - sha256 = "10d1rjflp3gkmgk5zlv2ck23p0fgpxrgf1jhfv9pvy3q02h9ldis"; + url = "http://mirrors.ibiblio.org/freetds/stable/${name}.tar.gz"; + sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; - configureFlags = [ - "--with-tdsver=7.0" - ]; + hardeningDisable = [ "format" ]; - buildInputs = [ - openssl - ] ++ stdenv.lib.optional odbcSupport unixODBC; + buildInputs = stdenv.lib.optional odbcSupport [ unixODBC ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + configureFlags = stdenv.lib.optionalString odbcSupport "--with-odbc=${unixODBC}"; - enableParallelBuilding = true; + doDist = true; - meta = with stdenv.lib; { - description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = http://www.freetds.org; - license = licenses.lgpl2; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + distPhase = '' + touch $out/include/tds.h + touch $out/lib/libtds.a + ''; + + meta = { + description = + "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; + homepage = http://www.freetds.org; + license = "lgpl"; + platforms = stdenv.lib.platforms.all; }; } -- cgit 1.4.1 From 8df1c9ac175d72c0c18ede3d22764ece9dceeeef Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:53 +0800 Subject: Revert "firewalld: init at 0.4.4.4" This reverts commit 178a96f99be69a173669254295d5a06732e7a906. --- nixos/modules/module-list.nix | 1 - nixos/modules/services/networking/firewalld.nix | 53 -------------- pkgs/os-specific/linux/firewalld/default.nix | 94 ------------------------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 150 deletions(-) delete mode 100644 nixos/modules/services/networking/firewalld.nix delete mode 100644 pkgs/os-specific/linux/firewalld/default.nix (limited to 'pkgs') diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1eef781a31d..5e6b42dea54 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -437,7 +437,6 @@ ./services/networking/firefox/sync-server.nix ./services/networking/fireqos.nix ./services/networking/firewall.nix - ./services/networking/firewalld.nix ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix diff --git a/nixos/modules/services/networking/firewalld.nix b/nixos/modules/services/networking/firewalld.nix deleted file mode 100644 index 02d694af390..00000000000 --- a/nixos/modules/services/networking/firewalld.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.networking.firewalld; - -in { - ###### interface - - options = { - networking.firewalld = { - enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable firewalld. firewalld is a high-level Linux-based packet - filtering framework intended for desktop use cases. - - This conflicts with the standard networking firewall, so make sure to - disable it before using firewalld. - ''; - }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - assertions = [{ - assertion = config.networking.firewall.enable == false; - message = "You can not use firewalld with services.networking.firewall."; - }]; - - environment.etc = [ - { source = "${pkgs.firewalld}/etc/firewalld"; - target = "firewalld"; } - ]; - - services = { - dbus.packages = with pkgs; [ firewalld ]; - }; - - systemd = { - packages = with pkgs; [ firewalld ]; - - services.firewalld = { - wantedBy = [ "multi-user.target" ]; - }; - }; - }; -} diff --git a/pkgs/os-specific/linux/firewalld/default.nix b/pkgs/os-specific/linux/firewalld/default.nix deleted file mode 100644 index 6b2e5803875..00000000000 --- a/pkgs/os-specific/linux/firewalld/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, lib, fetchFromGitHub -, autoreconfHook, docbook_xml_dtd_42, docbook_xsl, gettext, python3Packages -, intltool, libxslt, dbus, pkgconfig, iptables, ebtables, ipset, glib, kmod -, withKde ? true, plasma-nm ? null -}: - -let - slip = python3Packages.buildPythonPackage rec { - name = "python-slip-${version}"; - version = "0.6.4"; - - src = fetchFromGitHub { - owner = "nphilipp"; - repo = "python-slip"; - rev = name; - sha256 = "07zyxy62738dzsvifm1241k0zx5l3xl6s5yfhyn88wc59fa8p570"; - }; - - doCheck = false; # no tests - - buildPhase = '' - runHook preBuild - export PREFIX=$out - make - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - make install - runHook postInstall - ''; - - }; - -in python3Packages.buildPythonApplication rec { - name = "firewalld-${version}"; - version = "0.4.4.4"; - - src = fetchFromGitHub { - owner = "t-woerner"; - repo = "firewalld"; - rev = "v${version}"; - sha256 = "048flfcsi3ibp124k01hhf9bnbpyi3b92jgc96fhfvw6ns2l48qc"; - }; - - doCheck = false; # no tests - - propagatedBuildInputs = with python3Packages; [ - dbus - decorator - pygobject3 - pyqt5 - six - slip - ]; - - buildInputs = [ - autoreconfHook pkgconfig - docbook_xml_dtd_42 docbook_xsl gettext intltool libxslt - dbus ebtables glib ipset iptables - ]; - - preConfigure = '' - patchShebangs . - - substituteInPlace doc/xml/*.xml \ - --replace "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd" - - substituteInPlace src/firewall-applet \ - --replace /usr/bin/kde5-nm-connection-editor ${lib.getBin plasma-nm}/bin/kde5-nm-connection-editor - - export MODINFO=${kmod}/bin/modinfo - export MODPROBE=${kmod}/bin/modprobe - export RMMOD=${kmod}/bin/rmmod - ''; - - buildPhase = '' - ./autogen.sh --prefix=$out - make - ''; - - installPhase = '' - make install $out - cp -r config/{helpers,icmptypes,ipsets,services,zones} $out/etc/firewalld - ''; - - meta = with lib; { - description = "A service daemon with D-Bus interface"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 037e133a7d0..565b17984ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12212,8 +12212,6 @@ with pkgs; firejail = callPackage ../os-specific/linux/firejail {}; - firewalld = callPackage ../os-specific/linux/firewalld {}; - fnotifystat = callPackage ../os-specific/linux/fnotifystat { }; forkstat = callPackage ../os-specific/linux/forkstat { }; -- cgit 1.4.1 From 72d8eeea88d5b37bff179d6dbb3164f72bddca7e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:40:58 +0800 Subject: Revert "amarok-kf5: init at 2.8.91-20170228" This reverts commit fde0bad57796e29337e8a1f1dcbb0164f5e56b1c. --- pkgs/applications/audio/amarok/kf5.nix | 37 ---------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 39 deletions(-) delete mode 100644 pkgs/applications/audio/amarok/kf5.nix (limited to 'pkgs') diff --git a/pkgs/applications/audio/amarok/kf5.nix b/pkgs/applications/audio/amarok/kf5.nix deleted file mode 100644 index a96aa3ed65d..00000000000 --- a/pkgs/applications/audio/amarok/kf5.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ mkDerivation, fetchgit, lib -, extra-cmake-modules, kdoctools -, qca-qt5, qjson, qtscript, qtwebkit -, kcmutils, kconfig, kdelibs4support, kdnssd, kinit, knewstuff, knotifyconfig, ktexteditor -, phonon, plasma-framework, threadweaver -, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mariadb, pcre, snappy, taglib, taglib_extras -}: - -let - pname = "amarok"; - version = "2.8.91-20170228"; - -in mkDerivation { - name = "${pname}-${version}"; - - src = fetchgit { - url = git://anongit.kde.org/amarok.git; - # go back to the KDE mirror when kf5 is merged into master - # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - rev = "323e2d5b43245c4c06e0b83385d37ef0d32920cb"; - sha256 = "05w7kl6qfmkjz0y1bhgkkbmsqdll30bkjd6npkzvivrvp7dplmbh"; - }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ - qca-qt5 qjson qtscript qtwebkit - kcmutils kconfig kdelibs4support kdnssd kinit knewstuff knotifyconfig ktexteditor - phonon plasma-framework threadweaver - curl ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mariadb pcre snappy taglib taglib_extras - ]; - enableParallelBuilding = true; - - meta = with lib; { - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 565b17984ce..f01d1d97d31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13631,8 +13631,6 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { }; - AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; -- cgit 1.4.1 From a5e387592ad82c7197c86944c076d38dcdd44962 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:41:05 +0800 Subject: Revert "nix-upgrade-scripts: init at 0.0.4" This reverts commit 15d2cf5494a43b0b5312a834232af9b5b62f32ca. --- .../nix-upgrade-scripts/default.nix | 30 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/tools/package-management/nix-upgrade-scripts/default.nix (limited to 'pkgs') diff --git a/pkgs/tools/package-management/nix-upgrade-scripts/default.nix b/pkgs/tools/package-management/nix-upgrade-scripts/default.nix deleted file mode 100644 index d80e26a69fd..00000000000 --- a/pkgs/tools/package-management/nix-upgrade-scripts/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, nix }: - -stdenv.mkDerivation rec { - name = "nix-upgrade-scripts-${version}"; - version = "0.0.4"; - - src = fetchFromGitHub { - owner = "peterhoeg"; - repo = "nix-upgrade-scripts"; - rev = "v${version}"; - sha256 = "13v91nniwrs1fr92msrq6sq7vy1whrlxqd1ll4q3p1nrnbzpnxkn"; - }; - - installPhase = '' - mkdir -p $out/bin - cp -r bin lib $out/ - for f in $out/bin/* ; do - substituteInPlace $f \ - --replace '/usr/bin/env nix-shell' ${nix}/bin/nix-shell - done - chmod +x $out/bin/* - ''; - - meta = with stdenv.lib; { - description = "Scripts for making package upgrades easier"; - license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01d1d97d31..67cce24decf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19146,8 +19146,6 @@ with pkgs; nix-serve = callPackage ../tools/package-management/nix-serve { }; - nix-upgrade-scripts = callPackages ../tools/package-management/nix-upgrade-scripts { }; - nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nixos-icons = callPackage ../data/misc/nixos-artwork/icons.nix { }; -- cgit 1.4.1 From f22ce20ec0ecb29e8b1f1b08170276f6fe54c589 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 14 Oct 2017 14:42:17 +0800 Subject: Revert "hyperv-daemons: init at current linux kernel version" This reverts commit 51f1c635e679fdadead32e5aec464b28c254d099. --- pkgs/os-specific/linux/hyperv-daemons/default.nix | 109 ---------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 111 deletions(-) delete mode 100644 pkgs/os-specific/linux/hyperv-daemons/default.nix (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix deleted file mode 100644 index 91b3c25bd31..00000000000 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ stdenv, lib, python, kernel, makeWrapper, writeText }: - -let - daemons = stdenv.mkDerivation rec { - name = "hyperv-daemons-bin-${version}"; - inherit (kernel) src version; - - nativeBuildInputs = [ makeWrapper ]; - - # as of 4.9 compilation will fail due to -Werror=format-security - hardeningDisable = [ "format" ]; - - preConfigure = '' - cd tools/hv - ''; - - installPhase = '' - runHook preInstall - - for f in fcopy kvp vss ; do - install -Dm755 hv_''${f}_daemon -t $out/bin - done - - install -Dm755 hv_get_dns_info.sh lsvmbus -t $out/bin - - # I don't know why this isn't being handled automatically by fixupPhase - substituteInPlace $out/bin/lsvmbus \ - --replace '/usr/bin/env python' ${python.interpreter} - - runHook postInstall - ''; - - postFixup = '' - # kvp needs to be able to find the script(s) - wrapProgram $out/bin/hv_kvp_daemon --prefix PATH : $out/bin - ''; - }; - - service = bin: title: check: - writeText "hv-${bin}.service" '' - [Unit] - Description=Hyper-V ${title} daemon - ConditionVirtualization=microsoft - ${lib.optionalString (check != "") '' - ConditionPathExists=/dev/vmbus/${check} - ''} - [Service] - ExecStart=@out@/hv_${bin}_daemon -n - Restart=on-failure - PrivateTmp=true - Slice=hyperv.slice - - [Install] - WantedBy=hyperv-daemons.target - ''; - -in stdenv.mkDerivation rec { - name = "hyperv-daemons-${version}"; - - inherit (kernel) version; - - # we just stick the bins into out as well as it requires "out" - outputs = [ "bin" "lib" "out" ]; - - phases = [ "installPhase" ]; - - buildInputs = [ daemons ]; - - installPhase = '' - system=$lib/lib/systemd/system - - mkdir -p $system - - cp ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service - cp ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service - cp ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service - - cat > $system/hyperv-daemons.target < Date: Fri, 13 Oct 2017 20:10:51 +0000 Subject: ocamlmod: 0.0.8 -> 0.0.9 --- pkgs/development/tools/ocaml/ocamlmod/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index b24be7ba628..74dee630d29 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { name = "ocamlmod-${version}"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1544/${name}.tar.gz"; - sha256 = "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g"; + url = "https://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz"; + sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; + doCheck = true; + + checkPhase = "ocaml setup.ml -test"; + dontStrip = true; meta = { -- cgit 1.4.1 From c2758900a1be38e394b9dab5f1201e8703b695a5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Oct 2017 08:06:01 +0000 Subject: ocamlPackages.ansiterminal: 0.6.5 -> 0.7 --- pkgs/development/ocaml-modules/ansiterminal/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index ee25a47670e..7b9f0175151 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "ansiterminal-0.6.5"; + version = "0.7"; + + name = "ocaml${ocaml.version}-ansiterminal-${version}"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1206/ANSITerminal-0.6.5.tar.gz"; - sha256 = "1j9kflv2i16vf9hy031cl6z8hv6791mjbhnd9bw07y1pswdlx1r6"; + url = "https://github.com/Chris00/ANSITerminal/releases/download/${version}/ANSITerminal-${version}.tar.gz"; + sha256 = "03pqfxvw9pa9720l8i5fgxky1qx70kw6wxbczd5i50xi668lh0i9"; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -20,7 +22,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://forge.ocamlcore.org/projects/ansiterminal; + homepage = "https://github.com/Chris00/ANSITerminal"; description = "A module allowing to use the colors and cursor movements on ANSI terminals"; longDescription = '' ANSITerminal is a module allowing to use the colors and cursor -- cgit 1.4.1 From 5cca8800a466d6d0a0741bda9db7480288ce50a1 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Sat, 14 Oct 2017 11:08:04 +0200 Subject: notmuch-bower: init at 2017-09-27 (#29856) * bower: init and add erictapen as maintainer * bower: fix up * notmuch-bower: rename from bower --- lib/maintainers.nix | 1 + .../mailreaders/notmuch-bower/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/notmuch-bower/default.nix (limited to 'pkgs') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 4b4c1d2b507..a6989531347 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -196,6 +196,7 @@ eqyiel = "Ruben Maher "; ericbmerritt = "Eric Merritt "; ericsagnes = "Eric Sagnes "; + erictapen = "Justin Humm "; erikryb = "Erik Rybakken "; ertes = "Ertugrul Söylemez "; ethercrow = "Dmitry Ivanov "; diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix new file mode 100644 index 00000000000..dbdd64d06b5 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: + +stdenv.mkDerivation rec { + name = "notmuch-bower-${version}"; + version = "2017-09-27"; + + src = fetchFromGitHub { + owner = "wangp"; + repo = "bower"; + rev = "e4918ed581984bf2813f51f007a0aaaa7fa0da7f"; + sha256 = "13np5yharjik1pp23cfgffi0g0ikl6pl5sqqyy0ki7gk7gyy913i"; + }; + + nativeBuildInputs = [ gawk mercury pandoc ]; + + buildInputs = [ ncurses gpgme ]; + + makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ]; + + installPhase = '' + mkdir -p $out/bin + mv bower $out/bin/ + mkdir -p $out/share/man/man1 + mv bower.1 $out/share/man/man1/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/wangp/bower; + description = "A curses terminal client for the Notmuch email system"; + maintainers = with maintainers; [ erictapen ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67d619cf988..0860b964032 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13829,6 +13829,8 @@ with pkgs; brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; + notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; + bristol = callPackage ../applications/audio/bristol { }; bs1770gain = callPackage ../applications/audio/bs1770gain { -- cgit 1.4.1 From 30b3b5d85f4493aa0364ca2537b6d2070450a73e Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sat, 14 Oct 2017 11:09:00 +0200 Subject: announce myself as a maintainer added maintainer entries for `cdemu` (which i've created), as well as `wine` and `chromium` (which I regularly contribute to) --- lib/maintainers.nix | 1 + pkgs/applications/networking/browsers/chromium/browser.nix | 2 +- pkgs/misc/emulators/cdemu/base.nix | 1 + pkgs/misc/emulators/cdemu/vhba.nix | 1 + pkgs/misc/emulators/wine/base.nix | 2 +- 5 files changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a6989531347..3116336db90 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -72,6 +72,7 @@ bcarrell = "Brandon Carrell "; bcdarwin = "Ben Darwin "; bdimcheff = "Brandon Dimcheff "; + bendlas = "Herwig Hochleitner "; benley = "Benjamin Staffin "; bennofs = "Benno Fünfstück "; benwbooth = "Ben Booth "; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 75f2dcda6a6..54fee5847e1 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ chaoflow bendlas ]; license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index cc9d11f8643..e587151d3e7 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -32,5 +32,6 @@ in stdenv.mkDerivation ({ homepage = http://cdemu.sourceforge.net/; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } // drvParams) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 7ec83959e38..d03b18f12d6 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://cdemu.sourceforge.net/about/vhba/; platforms = platforms.linux; licenses = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0f59892cce1..64bb8b4e356 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -109,6 +109,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { homepage = http://www.winehq.org/; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = with stdenv.lib.maintainers; [ avnik raskin ]; + maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; }; }) -- cgit 1.4.1 From eef496f01c2b7d11e21d3f07e049f1f1ca752ecd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 14 Oct 2017 11:54:59 +0200 Subject: pythonPackages.yowsup: init at v2.5.2 (#30406) * pythonPackages.yowsup: init at v2.5.2 * python.pkgs.yowsup: fix tests --- .../yowsup/argparse-dependency.patch | 13 ++++++++++ pkgs/development/python-modules/yowsup/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/yowsup/argparse-dependency.patch create mode 100644 pkgs/development/python-modules/yowsup/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch new file mode 100644 index 00000000000..364f0054fe7 --- /dev/null +++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 053ed07..60f0d9a 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,7 +5,7 @@ import yowsup + import platform + import sys + +-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six'] ++deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six'] + + if sys.version_info < (2,7): + deps += ['importlib'] diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix new file mode 100644 index 00000000000..fce974ccd3a --- /dev/null +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "yowsup"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "tgalal"; + repo = "yowsup"; + rev = "v${version}"; + sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl"; + }; + + checkInputs = [ pytest ]; + checkPhase = '' + HOME=$(mktemp -d) py.test yowsup + ''; + + patches = [ ./argparse-dependency.patch ]; + + propagatedBuildInputs = [ six python-axolotl ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/tgalal/yowsup"; + description = "The python WhatsApp library"; + license = licenses.gpl3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index facb6eb25b3..5c2b10003ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26537,6 +26537,8 @@ EOF }; }; + yowsup = callPackage ../development/python-modules/yowsup { }; + wptserve = callPackage ../development/python-modules/wptserve { }; yenc = callPackage ../development/python-modules/yenc { }; -- cgit 1.4.1 From 60a7a4db83d53652e847104421702dd7969c4b9d Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 14 Oct 2017 12:36:15 +0200 Subject: erlang: fix ssl on darwin --- pkgs/development/interpreters/erlang/R19.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 680111dbd77..5e2e1c7f215 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,9 +1,18 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { version = "19.3"; sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; + patches = [ + # macOS 10.13 crypto fix from OTP-20.1.2 + (fetchpatch { + name = "darwin-crypto.patch"; + url = "https://github.com/erlang/otp/commit/882c90f72ba4e298aa5a7796661c28053c540a96.patch"; + sha256 = "1gggzpm8ssamz6975z7px0g8qq5i4jqw81j846ikg49c5cxvi0hi"; + }) + ]; + prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' ''; -- cgit 1.4.1 From 27bcd6c426914509e472d742ef17501ae6e885ed Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sat, 14 Oct 2017 14:07:44 +0300 Subject: mailnag: fix working (#30358) * mailnag: fix working * mailnag: use wrapGAppsHook; add icon theme --- .../networking/mailreaders/mailnag/default.nix | 37 ++++++++++------------ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 20 insertions(+), 21 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 6b8cf89fc75..281bc690bad 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, gettext, gtk3, python2Packages +{ stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome_keyring3 ? null, networkmanager ? null +, libgnome_keyring3, networkmanager +, wrapGAppsHook, gnome3 +, withGnomeKeyring ? false +, withNetworkManager ? true }: -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "mailnag-${version}"; version = "1.2.1"; @@ -13,26 +16,20 @@ python2Packages.buildPythonApplication rec { }; buildInputs = [ - gettext gtk3 python2Packages.pygobject3 python2Packages.dbus-python - python2Packages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer + gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager - ]; - - preFixup = '' - for script in mailnag mailnag-config; do - wrapProgram $out/bin/$script \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; + gst_all_1.gst-plugins-bad + gnome3.defaultIconTheme + ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3 + ++ stdenv.lib.optional withNetworkManager networkmanager; - buildPhase = ""; + nativeBuildInputs = [ + wrapGAppsHook + ]; - installPhase = "python2 setup.py install --prefix=$out"; + propagatedBuildInputs = with pythonPackages; [ + pygobject3 dbus-python pyxdg + ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0860b964032..6b595c94311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3218,7 +3218,9 @@ with pkgs; mailhog = callPackage ../servers/mail/mailhog {}; - mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; + mailnag = callPackage ../applications/networking/mailreaders/mailnag { + pythonPackages = python2Packages; + }; mailsend = callPackage ../tools/networking/mailsend { }; -- cgit 1.4.1 From 3ef3fc43a22f53cf2c00b9994569c28a83898829 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 14 Oct 2017 08:03:53 -0400 Subject: partition-all-cabal-hashes: cross-compile safe --- pkgs/data/misc/hackage/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index eae7a814674..14ae22798c2 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -19,7 +19,8 @@ let partition-all-cabal-hashes = stdenv.mkDerivation { name = "partition-all-cabal-hashes"; src = ./partition-all-cabal-hashes.c; unpackPhase = "true"; - buildInputs = [ pkgconfig libarchive glib ]; + buildInputs = [ libarchive glib ]; + nativeBuildInputs = [ pkgconfig ]; buildPhase = "cc -O3 $(pkg-config --cflags --libs libarchive glib-2.0) $src -o partition-all-cabal-hashes"; installPhase = -- cgit 1.4.1 From 415db05504cdf8422fd8b681fd1f1e91b920230a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 14 Oct 2017 12:53:46 +0000 Subject: ocamlPackages.uuidm: 0.9.5 -> 0.9.6 --- pkgs/development/ocaml-modules/uuidm/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 0391cd5033f..5a1689eaeeb 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.6"; name = "uuidm-${version}"; src = fetchurl { url = "http://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; - sha256 = "03bgxs119bphv9ggg97nsl5m61s43ixgby05hhggv16iadx9zndm"; + sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc"; }; unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; - configurePhase = "ocaml setup.ml -configure --prefix $prefix"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + inherit (topkg) buildPhase installPhase; createFindlibDestdir = true; -- cgit 1.4.1 From 8c618fce30b958b002c056a73f416b7722b0b6f0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 14 Oct 2017 10:28:27 -0400 Subject: linux: 4.13.6 -> 4.13.7 CVE-2017-5123 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 233c0130983..d54586c5f4f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.6"; + version = "4.13.7"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l30vlxmp49mm743cydkvr3wfw4nmh0q71avasnksd8xmv71km27"; + sha256 = "16vjjl3qw0a8ci6xbnywhb8bpr3ccbs0i6xa54lc094cd5gvx4v3"; }; } // (args.argsOverride or {})) -- cgit 1.4.1 From 7c4566294726a47cd35f603e06dfedee5e6f1b78 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 14 Oct 2017 16:38:33 +0200 Subject: go-ethereum: 1.7.1 -> 1.7.2 --- pkgs/applications/altcoins/go-ethereum.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 279e767173a..4a1c62535f9 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.7.1"; + version = "1.7.2"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1rhqnqp2d951d4084z7dc07q0my4wd5401968a0nqj030a9vgng2"; + sha256 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd"; }; # Fix cyclic referencing on Darwin -- cgit 1.4.1 From 741e78804b2947ef0f61a90f1ab7369d76f6df96 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sat, 14 Oct 2017 18:13:23 +0200 Subject: jenkins: 2.77 -> 2.84 --- pkgs/development/tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5c1c586fb90..bcd63769915 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.77"; + version = "2.84"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1hmj5f14qpq58018q2jmdd4j36v2idsbb9caiakxfy08gppzhz00"; + sha256 = "0pwmviaps4gbv9a3sdn17kqdv9jmh5fpbms1wm95jfj77m5dyyq6"; }; buildCommand = '' -- cgit 1.4.1 From 9b2af1869b021d44e119afd8080ba64bcd5a53ac Mon Sep 17 00:00:00 2001 From: Bjarki Ágúst Guðmundsson Date: Sat, 14 Oct 2017 16:46:58 +0000 Subject: astroid: 0.9.1 -> 0.10.2 - Use gmime3 instead of gmime2: https://github.com/astroidmail/astroid/issues/405 - Remove adwaita-icon-theme, as it is not needed - Add SuprDewd as a maintainer --- .../networking/mailreaders/astroid/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 8ba53b343f3..0324012b278 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,31 +1,30 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x-gtk3 +{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 , libsass, notmuch, boost, wrapGAppsHook }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.9.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0ha2jd3fvc54amh0x8f58s9ac4r8xgyhvkwd4jvs0h4mfh6cg496"; + sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c"; }; nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings_desktop_schemas - gnome3.adwaita-icon-theme ]; + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas + notmuch boost gnome3.gsettings_desktop_schemas ]; buildPhase = "scons --propagate-environment --prefix=$out build"; installPhase = "scons --propagate-environment --prefix=$out install"; - meta = { + meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; description = "GTK+ frontend to the notmuch mail system"; - maintainers = [ stdenv.lib.maintainers.bdimcheff ]; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ bdimcheff SuprDewd ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } -- cgit 1.4.1 From 527f6e9c47190b3bcd54f0ee78e523947ee15502 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 14 Oct 2017 18:56:41 +0200 Subject: android-studio-preview: 3.0.0.15 -> 3.0.0.16 --- pkgs/applications/editors/android-studio/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 8ee5f0319aa..061d75d4016 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.15"; # "Android Studio 3.0 Beta 7" - build = "171.4365657"; - sha256Hash = "0am3rq0ag982ik95mpcxvx2zlv0h4l6747b29mlsbqih66868db6"; + version = "3.0.0.16"; # "Android Studio 3.0 RC 1" + build = "171.4392136"; + sha256Hash = "13zaqbbl7bqhiwh0ybbxkfv0h90qsfpa7sim778n2j32jjvdcby5"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; -- cgit 1.4.1 From 0f01f8b882627b063f00722a2a8985fcfe6a82cf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Oct 2017 20:07:27 +0200 Subject: nginxMainline: 1.13.5 -> 1.13.6 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5ec0c7d4da5..0eb8979c3ac 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.5"; - sha256 = "0blzna6h76xd7ddz37yb7yqg4yx7gpwsz8zbg8vlbxxk552bjx8f"; + version = "1.13.6"; + sha256 = "1y7qcdpjskjc1iwwrjqsbgm74jpnf873pwv17clsy83ak1pzq4l5"; }) -- cgit 1.4.1 From e067d26f43c2b798db692e329afc074b79acf086 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 14 Oct 2017 21:23:16 +0200 Subject: firefox: fixup build on i686-linux after 56.x update Broken since #30143. I can't say I understand why this combination is apparently unsupported. i686-linux is a second-tier platform now, but firefox is still kept a channel blocker... --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index cc7927fdc54..b8f57eb2edb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -130,7 +130,8 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "56") [ + ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] -- cgit 1.4.1 From b5610ed3f0cfdad9a6c7d542e963659f63e4f3a7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 14 Oct 2017 02:10:35 -0500 Subject: sqitch: fix on Darwin Fixes #30389. --- pkgs/development/tools/misc/sqitch/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index b7b42b59653..8328433a823 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do - ln -s ${sqitchModule}/$d $out/$d + # make sure dest alreay exists before symlink + # this prevents installing a broken link into the path + if [ -e ${sqitchModule}/$d ]; then + ln -s ${sqitchModule}/$d $out/$d + fi done ''; dontStrip = true; -- cgit 1.4.1 From c37198e81d7b96568e6c4c82a48fc7cfb7247dd7 Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Sat, 14 Oct 2017 21:47:13 +0200 Subject: lbdb: 0.38 -> 0.44 --- pkgs/tools/misc/lbdb/add-methods-to-rc.patch | 11 ++++++++++ pkgs/tools/misc/lbdb/default.nix | 32 +++++++++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/misc/lbdb/add-methods-to-rc.patch (limited to 'pkgs') diff --git a/pkgs/tools/misc/lbdb/add-methods-to-rc.patch b/pkgs/tools/misc/lbdb/add-methods-to-rc.patch new file mode 100644 index 00000000000..d388467559a --- /dev/null +++ b/pkgs/tools/misc/lbdb/add-methods-to-rc.patch @@ -0,0 +1,11 @@ +--- a/lbdb.rc.in ++++ b/lbdb.rc.in +@@ -40,7 +40,7 @@ + # - m_vcf search a vcard (according to RFC2426) file. + # - m_khard search a CardDAV address book via khard + +-METHODS="m_inmail m_passwd m_finger" ++METHODS="@MODULES@" + + + # diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index e81ad349874..35cc95cb2cf 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -1,17 +1,39 @@ -{ stdenv, fetchurl, perl, finger_bsd }: +{ stdenv, fetchurl, perl, perlPackages, finger_bsd, makeWrapper +, abook ? null +, gnupg ? null +, goobook ? null +, khard ? null +}: let - version = "0.38"; + version = "0.44"; in - +with stdenv.lib; +with perlPackages; stdenv.mkDerivation { name = "lbdb-${version}"; src = fetchurl { url = "http://www.spinnaker.de/debian/lbdb_${version}.tar.gz"; - sha256 = "1279ssfrh4cqrjzq5q47xbdlw5qx3aazxjshi86ljm4cw6xxvgar"; + sha256 = "0kjz3n2ilrg6yrz8z40714ppdprgwhbgvzcsjzs822l6da4qxna3"; }; - buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) finger_bsd; + buildInputs = [ goobook makeWrapper perl ConvertASN1 NetLDAP AuthenSASL ] + ++ optional (!stdenv.isDarwin) finger_bsd + ++ optional (abook != null) abook + ++ optional (gnupg != null) gnupg + ++ optional (goobook != null) goobook + ++ optional (khard != null) khard; + configureFlags = [ ] + ++ optional (abook != null) "--with-abook" + ++ optional (gnupg != null) "--with-gpg" + ++ optional (goobook != null) "--with-goobook" + ++ optional (khard != null) "--with-khard"; + + patches = [ ./add-methods-to-rc.patch ]; + postFixup = "wrapProgram $out/lib/mutt_ldap_query --prefix PERL5LIB : " + + "${AuthenSASL}/${perl.libPrefix}" + + ":${ConvertASN1}/${perl.libPrefix}" + + ":${NetLDAP}/${perl.libPrefix}"; meta = { homepage = http://www.spinnaker.de/lbdb/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8582966e81d..8f7619825e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15280,7 +15280,7 @@ with pkgs; lastfmsubmitd = callPackage ../applications/audio/lastfmsubmitd { }; - lbdb = callPackage ../tools/misc/lbdb { }; + lbdb = callPackage ../tools/misc/lbdb { abook = null; gnupg = null; goobook = null; khard = null; }; lbzip2 = callPackage ../tools/compression/lbzip2 { }; -- cgit 1.4.1 From 30db0a66f47759da6ef27944770fdd0b4da7ae5e Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 14 Oct 2017 22:05:14 +0200 Subject: check: 0.10.0 -> 0.11.0 --- pkgs/development/libraries/check/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 3bfcde57422..1db991f63fe 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "check-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "0lhhywf5nxl3dd0hdakra3aasl590756c9kmvyifb3vgm9k0gxgm"; + url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; + sha256 = "05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { can be used within source code editors and IDEs. ''; - homepage = http://check.sourceforge.net/; + homepage = https://libcheck.github.io/check/; license = licenses.lgpl2Plus; platforms = platforms.all; -- cgit 1.4.1 From 416fe660dffbdb13d810f4412acb4d1490f4f460 Mon Sep 17 00:00:00 2001 From: mimadrid Date: Sat, 14 Oct 2017 22:08:19 +0200 Subject: rofi: 1.3.1 -> 1.4.1 --- pkgs/applications/misc/rofi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index c5f4095e59a..1e8320d75a3 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification +, bison, flex, librsvg, check }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4.1"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "09i3vd8k6zqphrm382fglsmxc4q6dg00xddzl96kakszgvdd4qfs"; + sha256 = "19x11s71q24gjdnsjf1ar6raq1drav7qp3nzjkw8qajpgvjrxwcn"; }; preConfigure = '' @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libxkbcommon pango cairo git + buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; doCheck = true; -- cgit 1.4.1 From 22b4c58a9f9003e9149af1b82d85d37aaa841841 Mon Sep 17 00:00:00 2001 From: Florian Jacob Date: Fri, 13 Oct 2017 23:41:05 +0200 Subject: piwik: 3.1.1 -> 3.2.0 --- pkgs/servers/web-apps/piwik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix index 091391166d7..e5d6876ecbf 100644 --- a/pkgs/servers/web-apps/piwik/default.nix +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "piwik-${version}"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "2mqzk12959j9xqb9cqz8np35zcs1313zjx9pikbjw9z9mfcqgv0ccvrnl2ymmwll333drr9qaxs54n0mkk66xbhz04nmzmib0kp9k8h"; + sha512 = "21hss97mms5vavfzw41v2p3qsxx0ar8xa3dnr4d2fw2mps8jg3s5ng9i725lqrbl96q7855fh9ymabjsi1zr4q9nif2yap0izaakxib"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit 1.4.1 From 1e6662dc6a12c7454a1296af40a88c8dba1b598e Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 14 Oct 2017 18:13:25 -0500 Subject: sqldeveloper: Add a detailed requireFile message --- .../tools/database/sqldeveloper/default.nix | 27 ++++++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 929aeb23e6d..6895e8b509b 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,12 +1,29 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - name = "sqldeveloper-17.2.0.188.1159"; + version = "17.2.0.188.1159"; + name = "sqldeveloper-${version}"; - src = requireFile { - name = "${name}-no-jre.zip"; - url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; - /* Actual direct link (would it be allowed to give that link?): http://download.oracle.com/otn/java/sqldeveloper/sqldeveloper-17.2.0.188.1159-no-jre.zip */ + src = requireFile rec { + name = "sqldeveloper-${version}-no-jre.zip"; + url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-downloads-172-3939055.html"; + message = '' + This Nix expression requires that ${name} already be part of the store. To + obtain it you need to + + - navigate to ${url} + - accept the license agreement + - download the file listed under "Other Platforms" + - sign in or create an oracle account if neccessary + + and then add the file to the Nix store using either: + + nix-store --add-fixed sha256 ${name} + + or + + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; sha256 = "03960705fabc7b3fa98d55a31ee6a17f783b8c8b01462613c6b6a699e8cae4d5"; }; -- cgit 1.4.1 From 6591a70812c9d8d0702b60c05d9e8d55382ecc09 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 14 Oct 2017 18:14:34 -0500 Subject: sqldeveloper: 17.2 -> 17.3 --- pkgs/development/tools/database/sqldeveloper/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 6895e8b509b..d5acd487e6b 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,17 +1,25 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - version = "17.2.0.188.1159"; + version = "17.3.0.271.2323"; name = "sqldeveloper-${version}"; src = requireFile rec { name = "sqldeveloper-${version}-no-jre.zip"; - url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/sqldev-downloads-172-3939055.html"; + url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; message = '' This Nix expression requires that ${name} already be part of the store. To obtain it you need to - navigate to ${url} + - make sure that it says "Version ${version}" above the list of downloads + - if it does not, click on the "Previous Version" link below the downloads + and repeat until the version is correct. This is necessarry because as the + time of this writing there exists no permanent link for the current version + yet. + Also consider updating this package yourself (you probably just need to + change the `version` variable and update the sha256 to the one of the + new file) or opening an issue at the nixpkgs repo. - accept the license agreement - download the file listed under "Other Platforms" - sign in or create an oracle account if neccessary @@ -24,7 +32,8 @@ stdenv.mkDerivation rec { nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "03960705fabc7b3fa98d55a31ee6a17f783b8c8b01462613c6b6a699e8cae4d5"; + # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` + sha256 = "06ba5920544bacbea83425548b1b8f69ab3e9bb279076321aece2c0c6d415dad"; }; buildInputs = [ makeWrapper unzip ]; -- cgit 1.4.1 From 4eb6e845f96d4fdb48c7d50f6138b68192362e42 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Oct 2017 08:31:37 +0000 Subject: ocamlPackages.javalib: 2.3.3 -> 2.3.4 --- pkgs/development/ocaml-modules/javalib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 843cf44a153..6bd98905afa 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2; - sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11"; + url = "https://gforge.inria.fr/frs/download.php/file/37153/javalib-2.3.4.tar.bz2"; + sha256 = "081ga3qzx0lkz0wy92qyj6k75k3s79518bvqii2q778hh5wif36f"; }; buildInputs = [ which ocaml findlib camlp4 ]; -- cgit 1.4.1 From 5a21efdcdf7c3f4349192036e661247e2cd07916 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 15 Oct 2017 12:59:30 +0200 Subject: gitAndTools.git-dit: 0.1.0 -> 0.3.0 --- .../git-and-tools/git-dit/default.nix | 56 +++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index a4b552bcca3..d68430714de 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -1,39 +1,41 @@ -{ stdenv, fetchFromGitHub, pandoc }: - -stdenv.mkDerivation rec { +{ stdenv +, fetchFromGitHub +, openssl +, gcc +, zlib +, libssh +, cmake +, perl +, pkgconfig +, rustPlatform +}: + +with rustPlatform; + +buildRustPackage rec { name = "git-dit-${version}"; - version = "0.1.0"; - - buildInputs = [ pandoc ]; + version = "0.4.0"; src = fetchFromGitHub { owner = "neithernut"; repo = "git-dit"; rev = "v${version}"; - sha256 = "1rvp2dhnb8yqrracvfpvf8z1vz4fs0rii18hhrskr6n1sfd7x9kd"; + sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; - # the Makefile doesn’t work, we emulate it below - dontBuild = true; - - postPatch = '' - # resolve binaries to the right path - sed -e "s|exec git-dit-|exec $out/bin/git-dit-|" -i git-dit + depsSha256 = "1z2n3z5wkh5z5vc976yscq77fgjszwzwlrp7g17hmsbhzx6x170h"; - # we change every git dit command to the local subcommand path - # (git dit foo -> /nix/store/…-git-dit/bin/git-dit-foo) - for script in git-dit-*; do - sed -e "s|git dit |$out/bin/git-dit-|g" -i "$script" - done - ''; + nativeBuildInputs = [ + cmake + pkgconfig + perl + ]; - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - # from the Makefile - ${stdenv.lib.getBin pandoc}/bin/pandoc -s -t man git-dit.1.md \ - -o $out/share/man/man1/git-dit.1 - cp git-dit* $out/bin - ''; + buildInputs = [ + openssl + libssh + zlib + ]; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -41,6 +43,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ profpatsch matthiasbeyer ]; }; - - } -- cgit 1.4.1 From f7d308dbdc166bef33b677128021eeff29a709b0 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 3 Oct 2017 03:50:20 +0300 Subject: plyfile: init at 0.5 --- .../development/python-modules/plyfile/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/plyfile/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix new file mode 100644 index 00000000000..410a633c46b --- /dev/null +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, numpy +}: + +buildPythonPackage rec { + pname = "plyfile"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cspvhfy2nw1rfwpvrd69wkz0b6clr4wzqpwpmdk872vk2q89yzi"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with lib; { + description = "NumPy-based text/binary PLY file reader/writer for Python"; + homepage = "https://github.com/dranjan/python-plyfile"; + maintainers = with maintainers; [ abbradar ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c2b10003ca..9ae6fb2ca91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7046,6 +7046,8 @@ in { plotly = callPackage ../development/python-modules/plotly { }; + plyfile = callPackage ../development/python-modules/plyfile { }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; pomegranate = callPackage ../development/python-modules/pomegranate { }; -- cgit 1.4.1 From 26db832fee73ba5e75c7dee29039b6e00125a07e Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 15 Oct 2017 14:55:36 +0200 Subject: qt56.qtwebkit: fix with icu-59 by upstream patch The patch is from qtwebkit-5.9.1, but it's fairly simple and seems to work here as well. --- .../qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch | 86 ++++++++++++++++++++++ .../development/libraries/qt-5/5.6/qtwebkit/series | 1 + 2 files changed, 87 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch (limited to 'pkgs') diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch new file mode 100644 index 00000000000..add365b5dd6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch @@ -0,0 +1,86 @@ +From: Konstantin Tokarev +Date: Thu, 4 May 2017 12:12:37 +0000 (+0300) +Subject: Fix compilation with ICU 59 +X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=bf172ae289a1348842005a9421797970f9b72060;hp=821eaaadc9d63d03aca65cf757230b520daaaa7c + +Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen +--- + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d4..77a3fd0 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f01..05e2733 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95..f5d6121 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; + template<> struct IsInteger { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67d..23400a6 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series index 140e2a3dd4e..7828e491c08 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series @@ -1,3 +1,4 @@ qtwebkit-dlopen-gtk.patch qtwebkit-dlopen-udev.patch qtwebkit-icucore-darwin.patch +qtwebkit-icu-59.patch -- cgit 1.4.1 From 8619ae38e7d44f0698e181fb64341dd394edfb04 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Oct 2017 22:58:12 +0200 Subject: unifi: 5.6.16 -> 5.6.18 --- pkgs/servers/unifi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 08a9637308c..d0cd8f8085a 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.16"; + version = "5.6.18"; src = fetchurl { - url = "https://www.ubnt.com/downloads/unifi/${version}-86cdeea491/unifi_sysvinit_all.deb"; - sha256 = "1kfrawf48q9rx48hcnmiqndbg84v340yfykh23af7xpcxmzl5jy7"; + url = "https://www.ubnt.com/downloads/unifi/${version}-8261dc5066/unifi_sysvinit_all.deb"; + sha256 = "1xcnfmxwzij9qs9l71d3zkmq6q3ci80a8xbmfckb0gz08cvrw5k1"; }; buildInputs = [ dpkg ]; -- cgit 1.4.1 From 5190b05fa243a2a5d238a59e04f83b0081141689 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 15:26:14 +0200 Subject: fastd: disable aes128-ctr, fix build with new libsodium --- pkgs/tools/networking/fastd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 3a99adb4a9e..ef356935c56 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0c9v3igv3812b3jr7jk75a2np658yy00b3i4kpbpdjgvqzc1jrq8"; }; + postPatch = '' + substituteInPlace src/crypto/cipher/CMakeLists.txt \ + --replace 'add_subdirectory(aes128_ctr)' "" + ''; + nativeBuildInputs = [ pkgconfig bison cmake ]; buildInputs = [ libuecc libsodium libcap json_c ]; -- cgit 1.4.1 From 68d48aae7e9ab230f64ab7b93c6d80afbe4be3c9 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 15 Oct 2017 15:44:50 +0200 Subject: plv8: use v8_6_x --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66248545aa8..7161f723d35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10126,7 +10126,9 @@ with pkgs; pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; - plv8 = callPackage ../servers/sql/postgresql/plv8 {}; + plv8 = callPackage ../servers/sql/postgresql/plv8 { + v8 = v8_6_x; + }; phonon = callPackage ../development/libraries/phonon {}; -- cgit 1.4.1 From 0a58a2fe53794325b164717dad2ca07e69fd82b2 Mon Sep 17 00:00:00 2001 From: Stefan Siegl Date: Sun, 15 Oct 2017 15:45:08 +0200 Subject: plv8: 2.0.3 -> 2.1.0 --- pkgs/servers/sql/postgresql/plv8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix index 15863373562..009f65b9d81 100644 --- a/pkgs/servers/sql/postgresql/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/plv8/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "plv8-${version}"; - version = "2.0.3"; + version = "2.1.0"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "0cn7ynckmdb08dkzjilvc55xz61d1jiya7yrnphizw404j84y3qc"; + sha256 = "1sfpxz0zcbinn6822j12lkwgrw9kfacrs83ic968rm489rl9w241"; }; preConfigure = '' -- cgit 1.4.1 From 1be825f1e50cba8dad200cc28847ce7ab7ea888f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 16:04:08 +0200 Subject: pythonPackages.libnacl: 1.5.2 -> 1.6.0, fix new libsodum --- pkgs/development/python-modules/libnacl/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index f70c9a57e5f..3704045d79a 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -1,13 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, libsodium }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: buildPythonPackage rec { pname = "libnacl"; - version = "1.5.2"; + version = "1.6.0"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2"; + src = fetchFromGitHub { + owner = "saltstack"; + repo = pname; + rev = "v${version}"; + sha256 = "0iaql3mrj3hf48km8177bi6nmjdar26kmqjc3jw8mrjc940v99fk"; }; buildInputs = [ pytest ]; -- cgit 1.4.1 From dc38f6c5248992643eef450fd78a5a4f9787843a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 16:13:32 +0200 Subject: pythonPackages.jsmin: init at 2.2.2 --- pkgs/development/python-modules/jsmin/default.nix | 18 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/python-modules/jsmin/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix new file mode 100644 index 00000000000..16be096f2ba --- /dev/null +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "jsmin"; + version = "2.2.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fsmqbjvpxvff0984x7c0y8xmf49ax9mncz48b9xjx8wrnr9kpxn"; + }; + + meta = with lib; { + description = "JavaScript minifier"; + homepage = "https://github.com/tikitu/jsmin/"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ae6fb2ca91..9dc764764c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6313,6 +6313,8 @@ in { }; }; + jsmin = callPackage ../development/python-modules/jsmin { }; + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; jsonpointer = buildPythonPackage rec { -- cgit 1.4.1 From c100811d63da25deaa459af3bafd8c5adb463cc8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 15 Oct 2017 16:16:04 +0200 Subject: scudcloud: add jsmin dependency, fixes build --- pkgs/applications/networking/instant-messengers/scudcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index f112d5f6110..441bc020868 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -9,7 +9,7 @@ in python3Packages.buildPythonPackage { sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; }; - propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; + propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python jsmin ]; meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; -- cgit 1.4.1 From 8f95aef531de13e6fffc62a31b4106f745d647ec Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Sep 2017 19:59:11 +0000 Subject: meson: do not strip RPATH https://github.com/NixOS/nixpkgs/pull/28444#issuecomment-324033323 --- pkgs/development/tools/build-managers/meson/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 77ff46d9472..1c2e726cdc5 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -18,7 +18,11 @@ python3Packages.buildPythonApplication rec { popd ''; - setupHook = ./setup-hook.sh; + postPatch = '' + sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py + ''; + + setupHook = ./setup-hook.sh; meta = with lib; { homepage = http://mesonbuild.com; -- cgit 1.4.1 From db11d7fd2b3b6c9a5051476856c95967af8998aa Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Sep 2017 20:02:04 +0000 Subject: xf86-input-libinput: 0.25.1 -> 0.26.0 --- pkgs/servers/x11/xorg/overrides.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c3665667107..c27f6a29e9c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -315,11 +315,11 @@ in installFlags = "sdkdir=\${out}/include/xorg"; }; - xf86inputlibinput = attrs: attrs // { - name = "xf86-input-libinput-0.25.1"; + xf86inputlibinput = attrs: attrs // rec { + name = "xf86-input-libinput-0.26.0"; src = args.fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.1.tar.bz2; - sha256 = "1q67hjd67ni1nq7kgxdrrdgkyhzaqvvn2vlnsiiq9w4y3icpv7s8"; + url = "mirror://xorg/individual/driver/${name}.tar.bz2"; + sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; buildInputs = attrs.buildInputs ++ [ args.libinput ]; installFlags = "sdkdir=\${out}/include/xorg"; -- cgit 1.4.1 From 12f460e9e62c08c25309ebf80718f7b27503a780 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Mon, 25 Sep 2017 20:01:05 +0000 Subject: libinput: 1.7.3 -> 1.8.3 fixes #29784 --- pkgs/development/libraries/libinput/default.nix | 33 ++++++++-------------- .../libraries/libinput/udev-absolute-path.patch | 21 +++++++------- 2 files changed, 22 insertions(+), 32 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1cc275b3048..0f0e6726032 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,49 +1,40 @@ -{ stdenv, fetchurl, pkgconfig -, libevdev, mtdev, udev, libwacom +{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null -, autoconf, automake -}: +, testsSupport ? false, check ? null, valgrind ? null }: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - -with stdenv.lib; -stdenv.mkDerivation rec { +let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false"; +in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.7.3"; + version = "1.8.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; + url = "https://freedesktop.org/software/libinput/${name}.tar.xz"; + sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig"; }; outputs = [ "out" "dev" ]; - configureFlags = [ + mesonFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") + (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") ]; - nativeBuildInputs = [ pkgconfig ]; + patches = [ ./udev-absolute-path.patch ]; - buildInputs = [ libevdev mtdev libwacom autoconf automake ] + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ libevdev mtdev libwacom ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; propagatedBuildInputs = [ udev ]; - patches = [ ./udev-absolute-path.patch ]; - patchFlags = [ "-p0" ]; - meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 2d3fa966b29..4b6bfc96d5a 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,12 +1,11 @@ ---- configure.ac 2016-05-27 14:00:25.248388226 +0200 -+++ configure.ac 2016-05-27 14:01:28.228943416 +0200 -@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil - # Used by the udev rules so we can use callouts during testing without - # installing everything first. Default is the empty string so the installed - # rule will use udev's default path. Override is in udev/Makefile.am --AC_SUBST(UDEV_TEST_PATH, "") -+UDEV_TEST_PATH="${UDEV_DIR}/" -+AC_SUBST(UDEV_TEST_PATH) - AC_PATH_PROG(SED, [sed]) +--- a/meson.build 2017-09-25 11:37:07.787726521 +0000 ++++ b/meson.build 2017-09-25 11:38:48.958233247 +0000 +@@ -100,7 +100,7 @@ + args : model_quirks) - AC_CONFIG_FILES([Makefile + udev_rules_config = configuration_data() +-udev_rules_config.set('UDEV_TEST_PATH', '') ++udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') + configure_file(input : 'udev/80-libinput-device-groups.rules.in', + output : '80-libinput-device-groups.rules', + install : true, -- cgit 1.4.1 From 19997f01007efe3124219befaf6467c15521706e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 15 Oct 2017 15:28:16 -0400 Subject: linux-copperhead: 4.13.6.a -> 4.13.7.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index f02a65b90a1..35222f20796 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.6"; + version = "4.13.7"; revision = "a"; - sha256 = "1xmnnwwlnc7s5zf08rzb4zqd52iysz81y9iqdn7rdqr3c8j7pdv9"; + sha256 = "1ddhjj77pslivy6ngkqn020z08n5nvq8p261hz14sgp8h69v30is"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); -- cgit 1.4.1 From 50ef776bd4c50d768b9f2c30fb4dc1e84c672012 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 15 Oct 2017 18:43:15 +0300 Subject: python.pkgs.Keras: remove default backend Theano is discontinued. Instead of setting TensorFlow by default let the user explicitly add preferred backend into environment. --- pkgs/development/python-modules/keras/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 1379d93c6dd..877fbe9470d 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,13 +1,6 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pytest -, pytestcov -, pytestpep8 -, pytest_xdist -, six -, Theano -, pyyaml +{ stdenv, lib, buildPythonPackage, fetchPypi +, pytest, pytestcov, pytestpep8, pytest_xdist +, six, numpy, scipy, pyyaml }: buildPythonPackage rec { @@ -28,7 +21,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six Theano pyyaml + six pyyaml numpy scipy ]; # Couldn't get tests working -- cgit 1.4.1 From 2d44e7280166256d8322546b11dcbe9b95f5bc5d Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 16 Oct 2017 00:06:06 +0200 Subject: httpie: remove superfluous field --- pkgs/tools/networking/httpie/default.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index b445dd93c4c..ef50c0ce084 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -2,7 +2,6 @@ pythonPackages.buildPythonApplication rec { name = "httpie-0.9.9"; - namePrefix = ""; src = fetchurl { url = "mirror://pypi/h/httpie/${name}.tar.gz"; -- cgit 1.4.1 From d5492433af0384893859ee0d4aa1b4f6cd12d355 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 13 Oct 2017 23:14:36 +0300 Subject: epson-escpr: 1.6.12 -> 1.6.16 --- pkgs/misc/drivers/epson-escpr/default.nix | 83 +++++++++++++++---------------- 1 file changed, 39 insertions(+), 44 deletions(-) (limited to 'pkgs') diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 60516190355..ce95ca00e11 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,46 +1,41 @@ { stdenv, fetchurl, cups }: -let - version = "1.6.12"; -in - stdenv.mkDerivation { - - name = "epson-escpr-${version}"; - - src = fetchurl { - - url = "https://download3.ebz.epson.net/dsc/f/03/00/05/46/21/01534966894f35247dac8c8ef0a0a9c94d1c8b40/epson-inkjet-printer-escpr-1.6.12-1lsb3.2.tar.gz"; - sha256 = "3773e74a0c4debf202eb9ad0aa31c6614a93d6170484ff660c14e99f8698cfda"; - }; - - patches = [ ./cups-filter-ppd-dirs.patch ]; - - buildInputs = [ cups ]; - - meta = with stdenv.lib; { - homepage = http://download.ebz.epson.net/dsc/search/01/search/; - description = "ESC/P-R Driver (generic driver)"; - longDescription = '' - Epson Inkjet Printer Driver (ESC/P-R) for Linux and the - corresponding PPD files. The list of supported printers - can be found at http://www.openprinting.org/driver/epson-escpr/ . - - To use the driver adjust your configuration.nix file: - services.printing = { - enable = true; - drivers = [ pkgs.epson-escpr ]; - }; - - To setup a wireless printer, enable Avahi which provides - printer's hostname to CUPS and nss-mdns to make this - hostname resolvable: - services.avahi = { - enable = true; - nssmdns = true; - };''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; - - } +stdenv.mkDerivation rec { + name = "epson-escpr-${version}"; + version = "1.6.16"; + + src = fetchurl { + url = "https://download3.ebz.epson.net/dsc/f/03/00/06/41/54/29588ed107f800e5bc3f91706661567efb369c1c/epson-inkjet-printer-escpr-1.6.16-1lsb3.2.tar.gz"; + sha256 = "0v9mcih3dg3ws18hdcgm014k97hv6imga39hy2a84gnc6badp6n6"; + }; + + patches = [ ./cups-filter-ppd-dirs.patch ]; + + buildInputs = [ cups ]; + + meta = with stdenv.lib; { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + description = "ESC/P-R Driver (generic driver)"; + longDescription = '' + Epson Inkjet Printer Driver (ESC/P-R) for Linux and the + corresponding PPD files. The list of supported printers + can be found at http://www.openprinting.org/driver/epson-escpr/ . + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson-escpr ]; + }; + + To setup a wireless printer, enable Avahi which provides + printer's hostname to CUPS and nss-mdns to make this + hostname resolvable: + services.avahi = { + enable = true; + nssmdns = true; + };''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; +} -- cgit 1.4.1 From 8c85edb446872b5e97022044c9e0b5e4ff0747e8 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Mon, 16 Oct 2017 09:37:34 +1030 Subject: flow: 0.57.0 -> 0.57.2 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 347abc14729..2f9d4f48d3f 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.57.0"; + version = "0.57.2"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1y2znwiwc3zkwz17a2m0m28dpknw7hpjd7ih4h7zf6p8nnqd3k6d"; + sha256 = "04fqnan9m69rjwvm97p0br1wd862ldiybp0v2nqlm6giaaa691r0"; }; installPhase = '' -- cgit 1.4.1 From cd9d780f894a0758ce0118945ee981d585116a3c Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sun, 15 Oct 2017 21:50:53 +0200 Subject: nodejs: 8.6.0 -> 8.7.0 --- pkgs/development/web/nodejs/v8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix index 013cab8f57b..560df06b8c5 100644 --- a/pkgs/development/web/nodejs/v8.nix +++ b/pkgs/development/web/nodejs/v8.nix @@ -10,11 +10,11 @@ let baseName = if enableNpm then "nodejs" else "nodejs-slim"; in stdenv.mkDerivation (nodejs // rec { - version = "8.6.0"; + version = "8.7.0"; name = "${baseName}-${version}"; src = fetchurl { url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz"; - sha256 = "14vy9xnyfz44j460hkrx423g7acpzzyqlxiv6sgmna9qj8872w5i"; + sha256 = "16mml3cwjnq7yf9yd67d2dybav3nvbnk89fkixs1wz7fd26d05ss"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ]; -- cgit 1.4.1 From bb94e0408f82e1279261b8dfff0111e466db74ff Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sun, 15 Oct 2017 20:01:24 +0200 Subject: rstudio: 1.1.351 -> 1.1.383 --- pkgs/applications/editors/rstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 930a18e39a6..bf8374fdaaa 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -3,7 +3,7 @@ R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: let - version = "1.1.351"; + version = "1.1.383"; ginVer = "1.5"; gwtVer = "2.7.0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz"; - sha256 = "0dpzmkq7jkdndidmmgdcr849q33ypmzkqwx22fraaqcy7w4f0pcn"; + sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f"; }; # Hack RStudio to only use the input R. -- cgit 1.4.1 From 800f751740ac699b7e881806239677e3cca31e89 Mon Sep 17 00:00:00 2001 From: Simon Lackerbauer Date: Sun, 15 Oct 2017 16:17:15 +0200 Subject: abella: 2.0.2 -> 2.0.4 --- pkgs/applications/science/logic/abella/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index d9afc897cff..968404362fc 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "abella-${version}"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { url = "http://abella-prover.org/distributions/${name}.tar.gz"; - sha256 = "b56d865ebdb198111f1dcd5b6fbcc0d7fc6dd1294f7601903ba4e3c3322c099c"; + sha256 = "1hnccjlyzwgz7kqsr4xmx9y4wmalbxsj0g6fxdk6xrgpc84ihw2c"; }; - buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild ]); + buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]); installPhase = '' mkdir -p $out/bin @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = http://abella-prover.org/; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ bcdarwin ]; + maintainers = with stdenv.lib.maintainers; [ bcdarwin ciil ]; platforms = stdenv.lib.platforms.unix; }; } -- cgit 1.4.1 From 7bf191337ef46e5ca5f5860419c8a85c446a5a45 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 16 Oct 2017 03:37:37 +0300 Subject: opencv: use BLAS and eigen by default Gives a performance boost. --- pkgs/development/libraries/opencv/3.x.nix | 4 ++-- pkgs/development/libraries/opencv/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index f6811b13717..8596ab6de88 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -14,8 +14,8 @@ , enableGtk3 ? false, gtk3 , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 -, enableEigen ? false, eigen -, enableOpenblas ? false, openblas +, enableEigen ? true, eigen +, enableOpenblas ? true, openblas , enableCuda ? false, cudatoolkit, gcc5 , enableTesseract ? false, tesseract, leptonica , AVFoundation, Cocoa, QTKit diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d7824dbed34..aadd108620a 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -9,7 +9,7 @@ , enableJPEG2K ? true, jasper , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all -, enableEigen ? false, eigen +, enableEigen ? true, eigen , darwin }: -- cgit 1.4.1 From 02a23b7b24d753baec14a860404a93de6d62931d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 15 Oct 2017 14:58:08 +0800 Subject: sddm: theme background images use a relative path which breaks sddm-kcm --- pkgs/applications/display-managers/sddm/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 97f05f6a433..3ce8d075410 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -50,12 +50,16 @@ in mkDerivation rec { postInstall = '' # remove empty scripts rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop" + for f in $out/share/sddm/themes/**/theme.conf ; do + substituteInPlace $f \ + --replace 'background=' "background=$(dirname $f)/" + done ''; meta = with lib; { description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; - platforms = platforms.linux; + homepage = https://github.com/sddm/sddm; maintainers = with maintainers; [ abbradar ttuegel ]; + platforms = platforms.linux; }; } -- cgit 1.4.1 From 4cec2d6fb71c8cdd04c8164101cfebe22e786929 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 16 Oct 2017 05:49:12 +0000 Subject: ocamlPackages.qtest: 2.6 -> 2.7 --- pkgs/development/ocaml-modules/qtest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index eb65384fc97..ecc1a89a804 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -4,13 +4,13 @@ if !stdenv.lib.versionAtLeast ocaml.version "4" then throw "qtest is not available for OCaml ${ocaml.version}" else -let version = "2.6"; in +let version = "2.7"; in stdenv.mkDerivation { - name = "ocaml-qtest-${version}"; + name = "ocaml${ocaml.version}-qtest-${version}"; src = fetchzip { url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "1v5c1n5p8rhnisn606fs05q8764lqwgw08w66y5dm8wgmxgmsb3k"; + sha256 = "0z72m2drp67qchvsxx4sg2qjrrq8hp6p9kzdx16ibx58pvpw1sh2"; }; buildInputs = [ ocaml findlib ocamlbuild ]; -- cgit 1.4.1 From c6f90f949337c6296fe9fd8137c2ba0bbdc318d5 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sun, 15 Oct 2017 17:15:45 +0100 Subject: pew: 0.1.14 -> 1.1.0 Pew was actually broken, due to a SHELL PATH check that had been added in the previous release (though this shouldn't have hampered users with bash as their shell) --- pkgs/development/tools/pew/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 21 --------------------- 3 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/tools/pew/default.nix (limited to 'pkgs') diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix new file mode 100644 index 00000000000..16fc4817417 --- /dev/null +++ b/pkgs/development/tools/pew/default.nix @@ -0,0 +1,32 @@ +{ stdenv, python3Packages }: +with python3Packages; buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "pew"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0b8z1vjsll1kgnh3mmdjps5rr9gayy091rapp2dra71jrwkx3yfh"; + }; + + propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; + + postFixup = '' + set -euo pipefail + PEW_SITE="$out/lib/${python.libPrefix}/site-packages" + SETUPTOOLS="${setuptools}/lib/${python.libPrefix}/site-packages" + SETUPTOOLS_SITE=$SETUPTOOLS/$(cat $SETUPTOOLS/setuptools.pth) + CLONEVENV_SITE="${virtualenv-clone}/lib/${python.libPrefix}/site-packages" + SITE_PACKAGES="[\'$PEW_SITE\',\'$SETUPTOOLS_SITE\',\'$CLONEVENV_SITE\']" + substituteInPlace $PEW_SITE/pew/pew.py \ + --replace "from pew.pew" "import sys; sys.path.extend($SITE_PACKAGES); from pew.pew" \ + --replace 'sys.executable, "-m", "virtualenv"' "'${virtualenv}/bin/virtualenv'" + ''; + + meta = with stdenv.lib; { + description = "Tools to manage multiple virtualenvs written in pure python"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ berdario ]; + }; + } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8616756a9ad..0c967d925e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6674,6 +6674,8 @@ with pkgs; svg2tikz = python27Packages.svg2tikz; + pew = callPackage ../development/tools/pew {}; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1a52015334b..231d5fecf6b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6994,27 +6994,6 @@ in { }; }; - pew = buildPythonPackage rec { - name = "pew-0.1.14"; - namePrefix = ""; - - disabled = pythonOlder "3.4"; # old versions require backported libraries - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pew/${name}.tar.gz"; - sha256 = "0p188ah80l0rzbib2srahj2sswz8rcpqwbrbajyv2r5c1m5k6r4b"; - }; - - propagatedBuildInputs = with self; [ virtualenv virtualenv-clone ]; - - meta = { - description = "Tools to manage multiple virtualenvs written in pure python, a virtualenvwrapper rewrite"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; - }; - pex = buildPythonPackage rec { name = "pex-${version}"; version = "1.2.7"; -- cgit 1.4.1 From e55b99e840e713f840f4a6989211913707838708 Mon Sep 17 00:00:00 2001 From: Dario Bertini Date: Sun, 15 Oct 2017 17:16:51 +0100 Subject: pipenv: init at 8.2.7 fixes #30442 --- pkgs/development/tools/pipenv/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/pipenv/default.nix (limited to 'pkgs') diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix new file mode 100644 index 00000000000..01433a6ce4d --- /dev/null +++ b/pkgs/development/tools/pipenv/default.nix @@ -0,0 +1,24 @@ +{ stdenv, python3Packages, pew }: +with python3Packages; buildPythonApplication rec { + name = "${pname}-${version}"; + pname = "pipenv"; + version = "8.2.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "08wkxs6qqgzxamym523bjv7zahg8p9v18x0yi9vwclij5k91iyzm"; + }; + + LC_ALL = "en_US.UTF-8"; + + propagatedBuildInputs = [ pew pip requests flake8 ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Python Development Workflow for Humans"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ berdario ]; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c967d925e2..8d70d61113b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6675,6 +6675,7 @@ with pkgs; svg2tikz = python27Packages.svg2tikz; pew = callPackage ../development/tools/pew {}; + pipenv = callPackage ../development/tools/pipenv {}; pyrex = pyrex095; -- cgit 1.4.1 From 88b853eb80ec0d0df3c01e773c57618df16e0ef3 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 16 Oct 2017 11:55:40 +0200 Subject: Revert "libinput: 1.7.3 -> 1.8.3" This reverts commit 12f460e9e62c08c25309ebf80718f7b27503a780. It doesn't build. Discuss at #29784. --- pkgs/development/libraries/libinput/default.nix | 33 ++++++++++++++-------- .../libraries/libinput/udev-absolute-path.patch | 21 +++++++------- 2 files changed, 32 insertions(+), 22 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 0f0e6726032..1cc275b3048 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,40 +1,49 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom +{ stdenv, fetchurl, pkgconfig +, libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null }: +, testsSupport ? false, check ? null, valgrind ? null +, autoconf, automake +}: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; -let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false"; -in with stdenv.lib; stdenv.mkDerivation rec { +let + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; +in + +with stdenv.lib; +stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.8.3"; + version = "1.7.3"; src = fetchurl { - url = "https://freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig"; + url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; + sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; }; outputs = [ "out" "dev" ]; - mesonFlags = [ + configureFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "debug-gui") + (mkFlag eventGUISupport "event-gui") (mkFlag testsSupport "tests") ]; - patches = [ ./udev-absolute-path.patch ]; + nativeBuildInputs = [ pkgconfig ]; - nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ libevdev mtdev libwacom ] + buildInputs = [ libevdev mtdev libwacom autoconf automake ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; propagatedBuildInputs = [ udev ]; + patches = [ ./udev-absolute-path.patch ]; + patchFlags = [ "-p0" ]; + meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 4b6bfc96d5a..2d3fa966b29 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,11 +1,12 @@ ---- a/meson.build 2017-09-25 11:37:07.787726521 +0000 -+++ b/meson.build 2017-09-25 11:38:48.958233247 +0000 -@@ -100,7 +100,7 @@ - args : model_quirks) +--- configure.ac 2016-05-27 14:00:25.248388226 +0200 ++++ configure.ac 2016-05-27 14:01:28.228943416 +0200 +@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil + # Used by the udev rules so we can use callouts during testing without + # installing everything first. Default is the empty string so the installed + # rule will use udev's default path. Override is in udev/Makefile.am +-AC_SUBST(UDEV_TEST_PATH, "") ++UDEV_TEST_PATH="${UDEV_DIR}/" ++AC_SUBST(UDEV_TEST_PATH) + AC_PATH_PROG(SED, [sed]) - udev_rules_config = configuration_data() --udev_rules_config.set('UDEV_TEST_PATH', '') -+udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') - configure_file(input : 'udev/80-libinput-device-groups.rules.in', - output : '80-libinput-device-groups.rules', - install : true, + AC_CONFIG_FILES([Makefile -- cgit 1.4.1 From 629965a53251afa23a60c08c16000b732374b9f9 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 16 Oct 2017 07:30:35 -0400 Subject: hostapd: patch for KRACKAttack CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake. CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake. CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake. CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake. CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake. CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it. CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake. CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake. CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. --- pkgs/os-specific/linux/hostapd/default.nix | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index c2320f8d7c7..fa4d604b400 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -23,6 +23,40 @@ stdenv.mkDerivation rec { url = "https://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae"; sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1"; }) + + #KRACKAttack.com + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; + sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; + sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; + sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; + sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; + sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; + sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; + }) + #(fetchurl { # wpa-supplicant only + # url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; + # sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; + #}) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; + sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; + }) ]; nativeBuildInputs = [ pkgconfig ]; -- cgit 1.4.1 From ea50efcc67cfa6c8331b54ff33ab791dacd52fe4 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 16 Oct 2017 07:31:01 -0400 Subject: wpa_supplicant: patch for KRACKAttack CVE-2017-13077: Reinstallation of the pairwise encryption key (PTK-TK) in the 4-way handshake. CVE-2017-13078: Reinstallation of the group key (GTK) in the 4-way handshake. CVE-2017-13079: Reinstallation of the integrity group key (IGTK) in the 4-way handshake. CVE-2017-13080: Reinstallation of the group key (GTK) in the group key handshake. CVE-2017-13081: Reinstallation of the integrity group key (IGTK) in the group key handshake. CVE-2017-13082: Accepting a retransmitted Fast BSS Transition (FT) Reassociation Request and reinstalling the pairwise encryption key (PTK-TK) while processing it. CVE-2017-13084: Reinstallation of the STK key in the PeerKey handshake. CVE-2017-13086: reinstallation of the Tunneled Direct-Link Setup (TDLS) PeerKey (TPK) key in the TDLS handshake. CVE-2017-13087: reinstallation of the group key (GTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. CVE-2017-13088: reinstallation of the integrity group key (IGTK) when processing a Wireless Network Management (WNM) Sleep Mode Response frame. --- pkgs/os-specific/linux/wpa_supplicant/default.nix | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 25160fb0c95..c2c05a6b99e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -80,6 +80,39 @@ stdenv.mkDerivation rec { patches = [ ./build-fix.patch + #KRACKAttack.com + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"; + sha256 = "02zl2x4pxay666yq18g4f3byccrzipfjbky1ydw62v15h76174aj"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"; + sha256 = "1mrmqg00x1bqa43dyhxb14msk74lh3kvr4avni43c3qpfjmlfvfq"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"; + sha256 = "10byyi8wfpcc8i788ag7ndycd3xvq2iwnssyb3rwf34sfcv5wlyl"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"; + sha256 = "02z2rsbh4sw81wsc56xjbblbi76ii0clmpnr1m1szdb1h5s58fkr"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"; + sha256 = "17pbrn5h6l5v14y6gn2yr2knqya9i0n2vyq4ck8hasb00yz8lz0l"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"; + sha256 = "19mgcqbdyzm4myi182jcn1rn26xi3jib74cpxbbrx1gaccxlsvar"; + }) + (fetchurl { # wpa-supplicant only + url = "http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch"; + sha256 = "0di71j8762dkvr0c7h5mrbkqyfdy8mljvnp0dk2qhbgc9bw7m8f5"; + }) + (fetchurl { + url = "http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"; + sha256 = "1ca312cixbld70rp12q7h66lnjjxzz0qag0ii2sg6cllgf2hv168"; + }) ]; postInstall = '' -- cgit 1.4.1 From 2c8058183f82a1862c90c3962d3260cda87c5324 Mon Sep 17 00:00:00 2001 From: Niclas Thall Date: Mon, 16 Oct 2017 13:41:39 +0200 Subject: qgis: 2.18.12 -> 2.18.13 --- pkgs/applications/gis/qgis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index a3ea89e2668..a008835f59f 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.12"; + name = "qgis-2.18.13"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0fh256j2d2kh9hjx6q1zdzxfqsgifg9dvgk214sv6zxzhsn0kxvs"; + sha256 = "033l3wg3l7hv4642wmsdycjca1dw8p89sk9xyc51wpb3id17vgv2"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; -- cgit 1.4.1 From 3f4a6754ef54b7584ab9779081e66b480a517db4 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 16 Oct 2017 13:50:12 +0100 Subject: wireguard: 0.0.20171005 -> 0.0.20171011 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 3c35bb372a2..b6d294836c2 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10"; let name = "wireguard-${version}"; - version = "0.0.20171005"; + version = "0.0.20171011"; src = fetchurl { url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz"; - sha256 = "026n0a7fln5w8s7lsxdn4fgzqxdwhqnnnfhczn36j3sipdy3nal3"; + sha256 = "15hby5fi85r7h7adr8kva26w9b2sz3147d7nl2y0fdblb3v4zr72"; }; meta = with stdenv.lib; { -- cgit 1.4.1 From 60b0db0e08197b9fd773a417ed96000841a905a5 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Sat, 14 Oct 2017 20:58:02 +0000 Subject: gitlab: link tmp/ directory to writable path --- nixos/modules/services/misc/gitlab.nix | 1 + pkgs/applications/version-management/gitlab/default.nix | 2 ++ 2 files changed, 3 insertions(+) (limited to 'pkgs') diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 38c73a13de9..14c184c3d68 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -581,6 +581,7 @@ in { mkdir -p ${cfg.statePath}/{log,uploads} ln -sf ${cfg.statePath}/log /run/gitlab/log ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads + ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp chown -R ${cfg.user}:${cfg.group} /run/gitlab # Prepare home directory diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 93829b05dae..657221d4b42 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -84,12 +84,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' + rm -r tmp mkdir -p $out/share cp -r . $out/share/gitlab rm -rf $out/share/gitlab/log ln -sf /run/gitlab/log $out/share/gitlab/log ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads ln -sf /run/gitlab/config $out/share/gitlab/config + ln -sf /run/gitlab/tmp $out/share/gitlab/tmp # rake tasks to mitigate CVE-2017-0882 # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/ -- cgit 1.4.1 From 00669df0c164f0d97c785b1fe48e1ba30b56a6ac Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Oct 2017 09:26:36 -0400 Subject: linux: 4.14-rc4 -> 4.14-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 30445500376..fe5cd8989de 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc4"; - modDirVersion = "4.14.0-rc4"; + version = "4.14-rc5"; + modDirVersion = "4.14.0-rc5"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1n9jni7sdawhjnlpl1g3rw89ggfi8d6s088wv1h21cnmsav911ik"; + sha256 = "1y383vw79jhpr15s919xwzxif2y8zbiwa64sg2aan075xfhzijp8"; }; # Should the testing kernels ever be built on Hydra? -- cgit 1.4.1 From 11cd2c52c4a4a760e0ae8338afafba5ad4fdaa56 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:24:02 -0500 Subject: nixpkgs: icestorm 2017.08.31 -> 2017.10.16 Also add myself to the maintainers list. Signed-off-by: Austin Seipp --- pkgs/development/tools/icestorm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 149901b78ea..b01127ffa56 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2017.08.31"; + version = "2017.10.16"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "8354bc6086f11002cc58497f91f43200a09c13a9"; - sha256 = "0mg6sp5ymdxmkyzmssyavsjicw0z74bn4lv1jqwxjnmynw5l0f9b"; + rev = "d9d2a3dcaa749014f5b9a539768b8368bb529b28"; + sha256 = "1a755jnbjq3v7a3l90qjlgihmrpbdfiiabb4g8sw3ay3qmvzwh6b"; }; buildInputs = [ python3 libftdi ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.clifford.at/icestorm/; license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.shell ]; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From 3b08d97e071ee86e113b915f6bbeb9d9c9b98f15 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:29:21 -0500 Subject: nixpkgs: simplify arachne-pnr makeFlags, make myself maintainer Signed-off-by: Austin Seipp --- pkgs/development/compilers/arachne-pnr/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 6508b05a534..0a0f8bbf082 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -11,10 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1wszcx6hgw4q4r778zswrlwdwvwxq834bkajck8w9yfqwxs9lmq8"; }; - preBuild = '' - makeFlags="DESTDIR=$out $makeFlags" - ''; - makeFlags = "ICEBOX=${icestorm}/share/icebox"; + makeFlags = + [ "DESTDIR=$(out)" "ICEBOX=${icestorm}/share/icebox" + ]; meta = { description = "Place and route tool for FPGAs"; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { ''; homepage = https://github.com/cseed/arachne-pnr; license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.shell ]; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From 35c885dc3d4f385b540e6ee18c8bec010e6f4ff8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:34:04 -0500 Subject: nixpkgs: yosys 2017.09.01 -> 2017.10.16, enable parallel builds Signed-off-by: Austin Seipp --- pkgs/development/compilers/yosys/default.nix | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 35172dbd15b..02f5d3494e6 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,27 +1,30 @@ -{ stdenv, fetchFromGitHub, fetchFromBitbucket, pkgconfig, tcl, readline, libffi, python3, bison, flex }: +{ stdenv, fetchFromGitHub, fetchFromBitbucket +, pkgconfig, tcl, readline, libffi, python3, bison, flex +}: stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2017.09.01"; + version = "2017.10.16"; srcs = [ (fetchFromGitHub { owner = "cliffordwolf"; repo = "yosys"; - rev = "18609f3df82a3403c41d552908183f7e49ff5678"; - sha256 = "0qdjxqg3l098g8pda5a4cif4bd78rx7vilv3z62r56ppj55mgw96"; + rev = "716dbc92745aa8b41d85a60d50263433d5a79393"; + sha256 = "0va77my4iddsw6psgjfhfgs0z0z1hpj0l8ipchcl8crpxipxcr77"; name = "yosys"; }) (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; - rev = "ff5be0604997"; - sha256 = "08gdvxm44dvhgjw6lf2jx0xyk6h4ai37h6b88dysvaa69sx7rh8n"; + rev = "6283c5d99b06"; + sha256 = "1mv8r1la4d4r9bk32sl4nq3flyxi8jf2ccaak64j5rz9hirrlpla"; name = "yosys-abc"; }) ]; sourceRoot = "yosys"; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ tcl readline libffi python3 bison flex ]; preBuild = '' @@ -43,9 +46,9 @@ stdenv.mkDerivation rec { adding additional passes as needed by extending the yosys C++ code base. ''; - homepage = http://www.clifford.at/yosys/; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.shell ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://www.clifford.at/yosys/; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; }; } -- cgit 1.4.1 From 740fb165da558cd0f341ddd46a4ff2585a3a294c Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 02:44:00 -0500 Subject: nixpkgs: add symbiyosys, for HDL verification flows Signed-off-by: Austin Seipp --- .../science/logic/symbiyosys/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/science/logic/symbiyosys/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix new file mode 100644 index 00000000000..5da3e7c31b4 --- /dev/null +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, yosys, python3 }: + +stdenv.mkDerivation rec { + name = "symbiyosys-${version}"; + version = "2017.10.16"; + + src = fetchFromGitHub { + owner = "cliffordwolf"; + repo = "symbiyosys"; + rev = "f403b99fae053baab651e3ec8345a68cb3ba6a96"; + sha256 = "0jzzlybxaqmhrasfjv3q3skshalr7lvv4p142qgdqz1ig36znbi8"; + }; + + buildInputs = [ python3 yosys ]; + + buildPhase = "true"; + installPhase = '' + mkdir -p $out/bin $out/share/yosys/python3 + + cp sbysrc/sby_*.py $out/share/yosys/python3/ + cp sbysrc/sby.py $out/bin/sby + chmod +x $out/bin/sby + + # Fix up shebang and Yosys imports + patchShebangs $out/bin/sby + substituteInPlace $out/bin/sby \ + --replace "##yosys-sys-path##" \ + "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" + ''; + meta = { + description = "Yosys verification tools for Hardware Definition Languages"; + homepage = https://symbiyosys.readthedocs.io/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d70d61113b..1afc58c6a21 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18684,6 +18684,8 @@ with pkgs; boolector = callPackage ../applications/science/logic/boolector {}; + symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; + ### SCIENCE / ELECTRONICS adms = callPackage ../applications/science/electronics/adms { }; -- cgit 1.4.1 From e84cec2762312aed553217117733ecf7fe5bff12 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 03:56:08 -0500 Subject: nixpkgs: add 'avy' -- property directed AIGER model checking Signed-off-by: Austin Seipp --- .../logic/avy/0001-no-static-boost-libs.patch | 12 ++++++++ pkgs/applications/science/logic/avy/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch create mode 100644 pkgs/applications/science/logic/avy/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch new file mode 100644 index 00000000000..a53142faba6 --- /dev/null +++ b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch @@ -0,0 +1,12 @@ +diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt +index 5913076..b0453b5 100644 +--- a/avy/CMakeLists.txt ++++ b/avy/CMakeLists.txt +@@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT) + set (Boost_NO_SYSTEM_PATHS "ON") + endif() + +-set (Boost_USE_STATIC_LIBS ON) + find_package (Boost 1.46.1 REQUIRED program_options) + IF (Boost_FOUND) + include_directories (${Boost_INCLUDE_DIRS}) diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix new file mode 100644 index 00000000000..379224c73f8 --- /dev/null +++ b/pkgs/applications/science/logic/avy/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, cmake, zlib, boost }: + +stdenv.mkDerivation rec { + name = "avy-${version}"; + version = "2017.10.16"; + + src = fetchgit { + url = "https://bitbucket.org/arieg/extavy"; + rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3"; + sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh"; + fetchSubmodules = true; + }; + + buildInputs = [ cmake zlib boost.out boost.dev ]; + NIX_CFLAGS_COMPILE = [ "-Wno-narrowing" ]; + patches = + [ ./0001-no-static-boost-libs.patch + ]; + + installPhase = '' + mkdir -p $out/bin + cp avy/src/{avy,avybmc} $out/bin/ + ''; + + meta = { + description = "AIGER model checking for Property Directed Reachability"; + homepage = https://arieg.bitbucket.io/avy/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1afc58c6a21..cee09d72987 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18682,6 +18682,8 @@ with pkgs; z3 = callPackage ../applications/science/logic/z3 {}; + avy = callPackage ../applications/science/logic/avy {}; + boolector = callPackage ../applications/science/logic/boolector {}; symbiyosys = callPackage ../applications/science/logic/symbiyosys {}; -- cgit 1.4.1 From b72f543f96159a07ca3e51f43b05b5b724c09b31 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 05:12:18 -0500 Subject: picosat: install more stuff Projects like the AIGER toolkit want to use the picosat.o object file in order to do SAT solving. Install this, along with the header and version information, so a build of the AIGER can use it. This means that picosat does not need to be built twice. Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/picosat/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 070664980dc..e026cfad218 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { configurePhase = "./configure.sh --shared --trace"; installPhase = '' - mkdir -p $out/bin $out/lib $out/include/picosat + mkdir -p $out/bin $out/lib $out/share $out/include/picosat cp picomus picomcs picosat picogcnf "$out"/bin + cp VERSION "$out"/share/picosat.version + cp picosat.o "$out"/lib cp libpicosat.a "$out"/lib cp libpicosat.so "$out"/lib -- cgit 1.4.1 From 635fbcbd33e80663824164bd17571cc45c8bb934 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 16 Oct 2017 05:13:46 -0500 Subject: nixpkgs: add aiger 1.9.9 Signed-off-by: Austin Seipp --- pkgs/applications/science/logic/aiger/default.nix | 53 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/science/logic/aiger/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix new file mode 100644 index 00000000000..2b959c72d37 --- /dev/null +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, picosat }: + +stdenv.mkDerivation rec { + name = "aiger-${version}"; + version = "1.9.9"; + + src = fetchurl { + url = "http://fmv.jku/aiger/${name}.tar.gz"; + sha256 = "1ish0dw0nf9gyghxsdhpy1jjiy5wp54c993swp85xp7m6vdx6l0y"; + }; + + enableParallelBuilding = true; + + configurePhase = '' + # Set up picosat, so we can build 'aigbmc' + echo $(pwd) + ls .. + mkdir ../picosat + ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h + ln -s ${picosat}/lib/picosat.o ../picosat/picosat.o + ln -s ${picosat}/share/picosat.version ../picosat/VERSION + ls .. + ./configure.sh + ''; + + installPhase = '' + mkdir -p $out/bin + + # Do the installation manually, as the Makefile has odd + # cyrillic characters, and this is easier than adding + # a whole .patch file. + BINS=( \ + aigand aigdd aigflip aigfuzz aiginfo aigjoin \ + aigmiter aigmove aignm aigor aigreset aigsim \ + aigsplit aigstrip aigtoaig aigtoblif aigtocnf \ + aigtodot aigtosmv aigunconstraint aigunroll \ + andtoaig bliftoaig smvtoaig soltostim wrapstim \ + aigbmc aigdep + ) + + for x in ''${BINS[*]}; do + install -m 755 -s $x $out/bin/$x + done + ''; + + meta = { + description = "And-Inverter Graph (AIG) utilities"; + homepage = http://fmv.jku.at/aiger/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cee09d72987..d6394c53b6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18682,6 +18682,8 @@ with pkgs; z3 = callPackage ../applications/science/logic/z3 {}; + aiger = callPackage ../applications/science/logic/aiger {}; + avy = callPackage ../applications/science/logic/avy {}; boolector = callPackage ../applications/science/logic/boolector {}; -- cgit 1.4.1 From 38e6ae8e440d3c1eb53c7f2bae9dedd2fdf9a5bb Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Sat, 14 Oct 2017 22:35:53 +0200 Subject: at: fix permission errors with "batch" on NixOS Fixes https://github.com/NixOS/nixpkgs/issues/12392 --- pkgs/tools/system/at/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 501a1bde33b..cc4ccdd40f0 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -1,4 +1,7 @@ -{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/run/wrappers/bin/sendmail" }: +{ fetchurl, stdenv, bison, flex, pam +, sendmailPath ? "/run/wrappers/bin/sendmail" +, atWrapperPath ? "/run/wrappers/bin/at" +}: stdenv.mkDerivation rec { name = "at-${version}"; @@ -30,6 +33,13 @@ stdenv.mkDerivation rec { --with-daemon_username=atd --with-daemon_groupname=atd ''; + # Ensure that "batch" can invoke the setuid "at" wrapper, if it exists, or + # else we get permission errors (on NixOS). "batch" is a shell script, so + # when the kernel executes it it drops setuid perms. + postInstall = '' + sed -i "6i test -x ${atWrapperPath} && exec ${atWrapperPath} -qb now # exec doesn't return" "$out/bin/batch" + ''; + meta = { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; -- cgit 1.4.1