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

Merge master into staging

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-05-09 10:48:01 +02:00
commit a18b493e02
33 changed files with 635 additions and 713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maintainers/maintainer-list.nix
View File

@ -3154,6 +3154,11 @@
github = "rittelle";
name = "Lennart Rittel";
};
rkoe = {
email = "rk@simple-is-better.org";
github = "rkoe";
name = "Roland Koebler";
};
rlupton20 = {
email = "richard.lupton@gmail.com";
github = "rlupton20";

9
nixos/doc/manual/development/option-types.xml
View File

@ -21,6 +21,15 @@
</para>
<variablelist>
<varlistentry>
<term><varname>types.attrs</varname>
</term>
<listitem>
<para>
A free-form attribute set.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>types.bool</varname>
</term>

1
nixos/modules/profiles/base.nix
View File

@ -17,6 +17,7 @@
pkgs.ddrescue
pkgs.ccrypt
pkgs.cryptsetup # needed for dm-crypt volumes
pkgs.mkpasswd # for generating password files
# Some networking tools.
pkgs.fuse

1
nixos/modules/system/boot/luksroot.nix
View File

@ -454,7 +454,6 @@ in
["firewire_ohci" "firewire_core" "firewire_sbp2"];
# Some modules that may be needed for mounting anything ciphered
# Also load input_leds to get caps lock light working (#12456)
boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ]
++ luks.cryptoModules
# workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged

18
pkgs/applications/editors/eclipse/plugins.nix
View File

@ -432,11 +432,11 @@ rec {
jsonedit = buildEclipsePlugin rec {
name = "jsonedit-${version}";
version = "1.1.0";
version = "1.1.1";
srcFeature = fetchurl {
url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar";
sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5";
sha256 = "0zkg8d8x3l5jpfxi0mz9dn62wmy4fjgpwdikj280fvsklmcw5b86";
};
srcPlugins =
@ -448,13 +448,13 @@ rec {
};
in
map fetch [
{ n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; }
{ n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; }
{ n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; }
{ n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; }
{ n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; }
{ n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; }
{ n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; }
{ n = "core"; h = "0svs0aswnhl26cqw6bmw30cisx4cr50kc5njg272sy5c1dqjm1zq"; }
{ n = "editor"; h = "1q62dinrbb18aywbvii4mlr7rxa20rdsxxd6grix9y8h9776q4l5"; }
{ n = "folding"; h = "1qh4ijfb1gl9xza5ydi87v1kyima3a9sh7lncwdy1way3pdhln1y"; }
{ n = "model"; h = "1pr6k2pdfdwx8jqs7gx7wzn3gxsql3sk6lnjha8m15lv4al6d4kj"; }
{ n = "outline"; h = "1jgr2g16j3id8v367jbgd6kx6g2w636fbzmd8jvkvkh7y1jgjqxm"; }
{ n = "preferences"; h = "027fhaqa5xbil6dmhvkbpha3pgw6dpmc2im3nlliyds57mdmdb1h"; }
{ n = "text"; h = "0clywylyidrxlqs0n816nhgjmk1c3xl7sn904ki4q050amfy0wb2"; }
];
propagatedBuildInputs = [ antlr-runtime_4_7 ];

37
pkgs/applications/graphics/graphicsmagick/compat.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, graphicsmagick }:
stdenv.mkDerivation rec {
name = "graphicsmagick-imagemagick-compat-${version}";
inherit (graphicsmagick) version;
unpackPhase = "true";
buildPhase = "true";
utils = [
"composite"
"conjure"
"convert"
"identify"
"mogrify"
"montage"
"animate"
"display"
"import"
];
# TODO: symlink libraries?
installPhase = ''
mkdir -p "$out"/bin
mkdir -p "$out"/share/man/man1
for util in ''${utils[@]}; do
ln -s ${graphicsmagick}/bin/gm "$out/bin/$util"
ln -s ${graphicsmagick}/share/man/man1/gm.1.gz "$out/share/man/man1/$util.1.gz"
done
'';
meta = {
description = "ImageMagick interface for GraphicsMagick";
license = stdenv.lib.licenses.free;
platforms = stdenv.lib.platforms.all;
};
}

5
pkgs/applications/graphics/graphicsmagick/default.nix
View File

@ -2,10 +2,9 @@
, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
let version = "1.3.29"; in
stdenv.mkDerivation {
stdenv.mkDerivation rec {
name = "graphicsmagick-${version}";
version = "1.3.29";
src = fetchurl {
url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -98,12 +98,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
version = "29.0.0.140";
version = "29.0.0.171";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh";
sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib";
stripRoot = false;
};

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
version = "29.0.0.140";
version = "29.0.0.171";
src = fetchurl {
url =
@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p"
"140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc"
else
"16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh"
"0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig"
else
if arch == "x86_64" then
"10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7"
"17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3"
else
"0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1";
"06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -55,7 +55,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
version = "29.0.0.140";
version = "29.0.0.171";
src = fetchurl {
url =
@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5"
"1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67"
else
"08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl";
"0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502";
};
nativeBuildInputs = [ unzip ];

85
pkgs/applications/office/gnucash/2.4.nix Normal file
View File

@ -0,0 +1,85 @@
{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
}:
/* If you experience GConf errors when running GnuCash on NixOS, see
* http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications
* for a possible solution.
*/
stdenv.mkDerivation rec {
name = "gnucash-2.4.15";
src = fetchurl {
url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
libgnomeprint goffice enchant gettext intltool perl guile slibGuile
swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
];
propagatedUserEnvPkgs = [ gconf ];
configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
postInstall = ''
# Auto-updaters don't make sense in Nix.
rm $out/bin/gnc-fq-update
sed -i $out/bin/update-gnucash-gconf \
-e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
for prog in $(echo "$out/bin/"*)
do
# Don't wrap the gnc-fq-* scripts, since gnucash calls them as
# "perl <script>', i.e. they must be Perl scripts.
if [[ $prog =~ gnc-fq ]]; then continue; fi
wrapProgram "$prog" \
--set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH" \
--prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH" \
--prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0" \
--prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0" \
--prefix PERL5LIB ":" "$PERL5LIB" \
--set GCONF_CONFIG_SOURCE 'xml::~/.gconf' \
--prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
# The following settings fix failures in the test suite. It's not required otherwise.
NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
doCheck = false; # https://github.com/NixOS/nixpkgs/issues/11084
enableParallelBuilding = true;
meta = {
description = "Personal and small-business financial-accounting application";
longDescription = ''
GnuCash is personal and small-business financial-accounting software,
freely licensed under the GNU GPL and available for GNU/Linux, BSD,
Solaris, macOS and Microsoft Windows.
Designed to be easy to use, yet powerful and flexible, GnuCash allows
you to track bank accounts, stocks, income and expenses. As quick and
intuitive to use as a checkbook register, it is based on professional
accounting principles to ensure balanced books and accurate reports.
'';
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://www.gnucash.org/;
maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
};
}

2
pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
View File

@ -33,7 +33,7 @@ in stdenv.mkDerivation {
meta = {
description = "Prevents you from committing passwords and other sensitive information to a git repository";
homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets;
homepage = https://github.com/awslabs/git-secrets;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
};

17
pkgs/applications/version-management/sit/aarch64-eexist.patch
View File

@ -1,17 +0,0 @@
diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs
index ebd357d..074dcc9 100644
--- a/sit-core/src/repository.rs
+++ b/sit-core/src/repository.rs
@@ -305,6 +305,12 @@ impl Repository {
let id: String = name.into();
let mut path = self.items_path.clone();
path.push(&id);
+ #[cfg(all(debug_assertions, target_arch = "aarch64"))] {
+ use std::io;
+ if path.is_dir() {
+ return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST
+ }
+ }
fs::create_dir(path)?;
let id = OsString::from(id);
Ok(Item {

9
pkgs/applications/version-management/sit/aarch64-isel.patch Normal file
View File

@ -0,0 +1,9 @@
diff --git a/.cargo/config b/.cargo/config
new file mode 100644
index 0000000..15e7649
--- /dev/null
+++ b/.cargo/config
@@ -0,0 +1,3 @@
+# https://github.com/rust-lang/rust/issues/50516
+[target.'cfg(all(debug_assertions, target_arch = "aarch64"))']
+rustflags = ["-C", "llvm-args=-fast-isel"]

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

@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
patches = [ ./aarch64-eexist.patch ];
patches = [ ./aarch64-isel.patch ];
meta = with stdenv.lib; {
description = "Serverless Information Tracker";

8
pkgs/applications/virtualization/singularity/default.nix
View File

@ -13,11 +13,13 @@
, gnused
, curl
, utillinux
, libarchive
, file
}:
stdenv.mkDerivation rec {
name = "singularity-${version}";
version = "2.4.6";
version = "2.5.1";
enableParallelBuilding = true;
@ -45,11 +47,11 @@ stdenv.mkDerivation rec {
owner = "singularityware";
repo = "singularity";
rev = version;
sha256 = "0bs1jqm7v7wv1kdxq8kyqn3gl5m76j0wwwgjyjnndrhczlsh5m1d";
sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d";
};
nativeBuildInputs = [ autoreconfHook makeWrapper ];
buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ];
buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive file ];
meta = with stdenv.lib; {
homepage = http://singularity.lbl.gov/;

25
pkgs/applications/window-managers/i3/lock-color.nix
View File

@ -29,8 +29,29 @@ stdenv.mkDerivation rec {
sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1
'';
meta = with stdenv.lib; {
description = "A simple screen locker like slock";
homepage = https://i3wm.org/i3lock/;
description = "A simple screen locker like slock, enhanced version with extra configuration options";
longDescription = ''
Simple screen locker. After locking, a colored background (default: white) or
a configurable image is shown, and a ring-shaped unlock-indicator gives feedback
for every keystroke. After entering your password, the screen is unlocked again.
i3lock-color is forked from i3lock (https://i3wm.org/i3lock/) with the following
enhancements / additional configuration options:
- indicator:
- shape: ring or bar
- size: configurable
- all colors: configurable
- all texts: configurable
- visibility: can be always visible, can be restricted to some screens
- background: optionally show a blurred screen instead of a single color
- more information: show text at configurable positions:
- clock: time/date with configurable format
- keyboard-layout
'';
homepage = http://github.com/PandorasFox/i3lock-color;
maintainers = with maintainers; [ garbas malyn ];
license = licenses.bsd3;

5
pkgs/applications/window-managers/i3/lock.nix
View File

@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple screen locker like slock";
longDescription = ''
Simple screen locker. After locking, a colored background (default: white) or
a configurable image is shown, and a ring-shaped unlock-indicator gives feedback
for every keystroke. After entering your password, the screen is unlocked again.
'';
homepage = https://i3wm.org/i3lock/;
maintainers = with maintainers; [ garbas malyn domenkozar ];
license = licenses.bsd3;

4
pkgs/data/misc/hackage/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl }:
fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/462dbb7e8a2ca65807ae21d1cc5f5c5454a9a327.tar.gz";
sha256 = "09rq2r9ydvmhk9182xl0yz4dbr84ncj8a7fc2qzln784zrd12aph";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a2febcad5a83b15dea74462890e3c48c13f55f1.tar.gz";
sha256 = "1z6mfk49hsxvcpv183wayirspx78xd1l0w42wf8mfyf0jh8grfff";
}

9
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound
, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
, gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec {
@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
];
preFixup = ''
gappsWrapperArgs+=(
# Fallback sound theme
--prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
)
'';
meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Clocks;
description = "Clock application designed for GNOME 3";

5
pkgs/development/coq-modules/dpdgraph/default.nix
View File

@ -1,6 +1,11 @@
{ stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
let params = {
"8.8" = {
version = "0.6.3";
rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2";
sha256 = "0c95b0bz2kjm6swr5na4gs06lxxywradszxbr5ldh2zx02r3f3rx";
};
"8.7" = {
version = "0.6.2";
rev = "d76ddde37d918569945774733b7997e8b24daf51";

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -422,8 +422,7 @@ self: super: {
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
# The doctest phase fails because it does not have a proper environment in
# which to run the commands it's ought to test.
# https://github.com/haskell-gi/haskell-gi/pull/163
haskell-gi = dontCheck super.haskell-gi;
# https://github.com/basvandijk/threads/issues/10

63
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 11.7
# LTS Haskell 11.8
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -94,7 +94,7 @@ default-package-overrides:
- amqp ==0.18.1
- annotated-wl-pprint ==0.7.0
- ansigraph ==0.3.0.5
- ansi-terminal ==0.8.0.2
- ansi-terminal ==0.8.0.3
- ansi-wl-pprint ==0.6.8.2
- ANum ==0.2.0.2
- apecs ==0.2.4.7
@ -158,7 +158,7 @@ default-package-overrides:
- bbdb ==0.8
- bcrypt ==0.0.11
- beam-core ==0.7.2.1
- beam-migrate ==0.3.1.0
- beam-migrate ==0.3.2.0
- beam-sqlite ==0.3.2.0
- bench ==1.0.9
- benchpress ==0.2.2.10
@ -331,7 +331,7 @@ default-package-overrides:
- codec ==0.2.1
- code-page ==0.1.3
- codo-notation ==0.5.2
- colorful-monoids ==0.2.1.0
- colorful-monoids ==0.2.1.1
- colorize-haskell ==1.0.1
- colour ==2.3.4
- colour-accelerate ==0.2.0.0
@ -488,7 +488,7 @@ default-package-overrides:
- dice ==0.1
- dictionaries ==0.2.0.4
- Diff ==0.3.4
- diff3 ==0.3.0
- diff3 ==0.3.1
- digest ==0.0.1.2
- digits ==0.3.1
- dimensional ==1.1
@ -600,10 +600,10 @@ default-package-overrides:
- exceptional ==0.3.0.0
- exception-mtl ==0.4.0.1
- exceptions ==0.8.3
- exception-transformers ==0.4.0.6
- exception-transformers ==0.4.0.7
- executable-hash ==0.2.0.4
- executable-path ==0.0.3.1
- exhaustive ==1.1.5
- exhaustive ==1.1.6
- expiring-cache-map ==0.0.6.1
- explicit-exception ==0.1.9.2
- exp-pairs ==0.1.6.0
@ -798,7 +798,7 @@ default-package-overrides:
- hackage-db ==2.0
- hackage-security ==0.5.3.0
- haddock-library ==1.4.5
- hailgun ==0.4.1.6
- hailgun ==0.4.1.7
- hailgun-simple ==0.1.0.0
- hakyll ==4.12.2.0
- half ==0.2.2.3
@ -830,7 +830,7 @@ default-package-overrides:
- haskell-spacegoo ==0.2.0.1
- haskell-src ==1.0.3.0
- haskell-src-exts ==1.20.2
- haskell-src-exts-util ==0.2.2
- haskell-src-exts-util ==0.2.3
- haskell-src-meta ==0.8.0.2
- haskell-tools-ast ==1.0.1.1
- haskell-tools-backend-ghc ==1.0.1.1
@ -852,7 +852,7 @@ default-package-overrides:
- haxr ==3000.11.2
- hbeanstalk ==0.2.4
- Hclip ==3.0.0.4
- HCodecs ==0.5
- HCodecs ==0.5.1
- hdaemonize ==0.5.5
- HDBC ==2.4.0.2
- HDBC-mysql ==0.7.1.0
@ -931,8 +931,8 @@ default-package-overrides:
- hsdns ==1.7.1
- hsebaysdk ==0.4.0.0
- hsemail ==2
- HSet ==0.0.1
- hset ==2.2.0
- HSet ==0.0.1
- hsexif ==0.6.1.5
- hs-GeoIP ==0.3
- hsignal ==0.2.7.5
@ -991,7 +991,7 @@ default-package-overrides:
- http-link-header ==1.0.3
- http-media ==0.7.1.2
- http-reverse-proxy ==0.5.0.1
- http-streams ==0.8.5.5
- http-streams ==0.8.6.1
- http-types ==0.12.1
- human-readable-duration ==0.2.0.3
- HUnit ==1.6.0.0
@ -1054,7 +1054,7 @@ default-package-overrides:
- inflections ==0.4.0.1
- influxdb ==1.3.0.1
- ini ==0.3.6
- inline-c ==0.6.0.5
- inline-c ==0.6.0.6
- inline-c-cpp ==0.2.1.0
- inline-java ==0.8.2
- inline-r ==0.9.1
@ -1083,7 +1083,7 @@ default-package-overrides:
- ip ==1.1.2
- ip6addr ==0.5.3
- iproute ==1.7.4
- IPv6Addr ==1.0.2
- IPv6Addr ==1.0.3
- IPv6DB ==0.2.6
- ipython-kernel ==0.9.0.2
- irc ==0.6.1.0
@ -1183,7 +1183,7 @@ default-package-overrides:
- libinfluxdb ==0.0.4
- libmpd ==0.9.0.8
- liboath-hs ==0.0.1.0
- libsystemd-journal ==1.4.2
- libsystemd-journal ==1.4.3
- libxml-sax ==0.7.5
- LibZip ==1.0.1
- licensor ==0.2.2
@ -1212,7 +1212,7 @@ default-package-overrides:
- log-elasticsearch ==0.9.1.0
- logfloat ==0.13.3.3
- logger-thread ==0.1.0.2
- logging-effect ==1.2.5
- logging-effect ==1.2.6
- logging-effect-extra ==1.2.2
- logging-effect-extra-file ==1.1.2
- logging-effect-extra-handler ==1.1.4
@ -1387,13 +1387,13 @@ default-package-overrides:
- network-anonymous-i2p ==0.10.0
- network-anonymous-tor ==0.11.0
- network-attoparsec ==0.12.2
- network-carbon ==1.0.11
- network-carbon ==1.0.12
- network-conduit-tls ==1.3.0
- network-house ==0.1.0.2
- network-info ==0.2.0.10
- network-ip ==0.3.0.2
- network-multicast ==0.2.0
- Network-NineP ==0.4.2
- Network-NineP ==0.4.3
- network-simple ==0.4.0.5
- network-transport ==0.5.2
- network-transport-composed ==0.2.1
@ -1537,7 +1537,7 @@ default-package-overrides:
- pipes-extras ==1.0.14
- pipes-fastx ==0.3.0.0
- pipes-fluid ==0.6.0.0
- pipes-group ==1.0.9
- pipes-group ==1.0.10
- pipes-misc ==0.4.0.1
- pipes-mongodb ==0.1.0.0
- pipes-network ==0.6.4.1
@ -1611,19 +1611,19 @@ default-package-overrides:
- prompt ==0.1.1.2
- protobuf ==0.2.1.1
- protobuf-simple ==0.1.0.5
- protocol-buffers ==2.4.8
- protocol-buffers-descriptor ==2.4.8
- protocol-buffers ==2.4.9
- protocol-buffers-descriptor ==2.4.9
- protocol-radius ==0.0.1.0
- protocol-radius-test ==0.0.1.0
- proto-lens ==0.2.2.0
- proto-lens-arbitrary ==0.1.1.1
- proto-lens-descriptors ==0.2.2.0
- proto-lens-optparse ==0.1.1.0
- proto-lens-optparse ==0.1.1.1
- protolude ==0.2.2
- proxied ==0.3
- psql-helpers ==0.1.0.0
- PSQueue ==1.1
- psqueues ==0.2.6.0
- psqueues ==0.2.7.0
- pthread ==0.2.0
- publicsuffix ==0.20171229
- pure-io ==0.2.1
@ -1705,7 +1705,7 @@ default-package-overrides:
- regex-tdfa ==1.2.3
- regex-tdfa-text ==1.0.0.3
- reinterpret-cast ==0.1.0
- relational-query ==0.11.0.0
- relational-query ==0.11.1.0
- relational-query-HDBC ==0.6.6.1
- relational-record ==0.2.1.2
- relational-schemas ==0.1.6.1
@ -1754,13 +1754,13 @@ default-package-overrides:
- say ==0.1.0.0
- sbp ==2.3.16
- sbv ==7.5
- scalendar ==1.2.0
- SCalendar ==1.1.0
- scalendar ==1.2.0
- scalpel ==0.5.1
- scalpel-core ==0.5.1
- scanner ==0.2
- schematic ==0.4.2.0
- scientific ==0.3.5.3
- scientific ==0.3.6.0
- scotty ==0.11.1
- scrypt ==0.5.0
- sdl2 ==2.4.0.1
@ -1842,7 +1842,7 @@ default-package-overrides:
- simple-session ==0.10.1.1
- simple-templates ==0.8.0.1
- singleton-bool ==0.1.4
- singleton-nats ==0.4.0.4
- singleton-nats ==0.4.1
- singletons ==2.3.1
- siphash ==1.0.3
- skein ==1.0.9.4
@ -1989,7 +1989,7 @@ default-package-overrides:
- tasty-kat ==0.0.3
- tasty-program ==1.0.5
- tasty-quickcheck ==0.9.2
- tasty-rerun ==1.1.10
- tasty-rerun ==1.1.11
- tasty-silver ==3.1.11
- tasty-smallcheck ==0.8.1
- tasty-stats ==0.2.0.3
@ -2262,12 +2262,11 @@ default-package-overrides:
- websockets-rpc ==0.6.0
- websockets-simple ==0.0.6.3
- websockets-snap ==0.10.2.5
- weigh ==0.0.7
- weigh ==0.0.11
- wide-word ==0.1.0.6
- wikicfp-scraper ==0.1.0.9
- wild-bind ==0.1.2.0
- wild-bind-x11 ==0.2.0.3
- Win32 ==2.5.4.1
- Win32-notify ==0.3.0.3
- wire-streams ==0.1.1.0
- withdependencies ==0.2.4.2
@ -2296,7 +2295,7 @@ default-package-overrides:
- writer-cps-morph ==0.1.0.2
- writer-cps-mtl ==0.1.1.4
- writer-cps-transformers ==0.1.1.3
- wuss ==1.1.8
- wuss ==1.1.9
- X11 ==1.8
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
@ -2358,7 +2357,7 @@ default-package-overrides:
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.0
- yesod-table ==2.0.3
- yesod-test ==1.6.3
- yesod-test ==1.6.4
- yesod-websockets ==0.3.0
- yes-precure5-command ==5.5.3
- yi-core ==0.17.1

919
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

13
pkgs/development/libraries/audio/vamp/default.nix
View File

@ -1,16 +1,19 @@
# set VAMP_PATH ?
# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
{ stdenv, fetchurl, pkgconfig, libsndfile }:
{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
rec {
vampSDK = stdenv.mkDerivation {
name = "vamp-sdk-2.5";
name = "vamp-sdk-2.7.1";
# version = "2.7.1";
src = fetchurl {
url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz;
sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv";
src = fetchFromGitHub {
owner = "c4dm";
repo = "vamp-plugin-sdk";
rev = "vamp-plugin-sdk-v2.7.1";
sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4";
};
nativeBuildInputs = [ pkgconfig ];

2
pkgs/development/libraries/webkitgtk/2.4.nix
View File

@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
buildInputs = [
gtk2 libwebp enchant
libxml2 libxslt
gst-plugins-base sqlite xorg.libXt
gst-plugins-base sqlite xorg.libXt xorg.libXdamage
] ++ optionals enableCredentialStorage [
libsecret
] ++ (if stdenv.isDarwin then [

2
pkgs/os-specific/windows/pthread-w32/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, mingw_headers }:
{ fetchurl, stdenv, mingw_header, hostPlatform, buildPlatform }:
# This file is tweaked for cross-compilation only.
assert hostPlatform != buildPlatform;

1
pkgs/stdenv/generic/default.nix
View File

@ -118,6 +118,7 @@ let
inherit (hostPlatform)
isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm;
# Whether we should run paxctl to pax-mark binaries.
needsPax = isLinux;

39
pkgs/tools/filesystems/ext4magic/default.nix Normal file
View File

@ -0,0 +1,39 @@
{ stdenv, fetchurl, fetchpatch, file, libuuid, e2fsprogs, zlib, bzip2 }:
stdenv.mkDerivation rec {
version = "0.3.2";
name = "ext4magic-${version}";
src = fetchurl {
url = "mirror://sourceforge/ext4magic/${name}.tar.gz";
sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115";
};
patches = [
(fetchpatch {
url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch;
sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c";
})
];
buildInputs = [ file libuuid e2fsprogs zlib bzip2 ];
installFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
description = "Recover / undelete files from ext3 or ext4 partitions";
longDescription = ''
ext4magic can recover/undelete files from ext3 or ext4 partitions
by retrieving file-information from the filesystem journal.
If the information in the journal are sufficient, ext4magic can
recover the most file types, with original filename, owner and group,
file mode bits and also the old atime/mtime stamps.
It's much more effective and works much better than extundelete.
'';
homepage = http://ext4magic.sourceforge.net/ext4magic_en.html;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.rkoe ];
};
}

12
pkgs/tools/misc/bat/default.nix
View File

@ -2,24 +2,24 @@
rustPlatform.buildRustPackage rec {
name = "bat-${version}";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "sharkdp";
repo = "bat";
rev = "v${version}";
sha256 = "0qbjkrakcpvnzzljifykw88g0qmmk60id23sjvhp4md54h4xg29p";
sha256 = "15d7i0iy5lks3jg9js6n6fy4xanjk76fpryl2kq88kdkq67hpzfp";
};
cargoSha256 = "07r10wwxv8svrw94djl092zj512868izlxldsiljfj34230abl02";
cargoSha256 = "179a7abhzpxjp3cc820jzxg0qk1fiv9rkpazwnzhkjl8yd7b7qi3";
buildInputs = with pkgs; [ openssl pkgconfig cmake zlib file perl curl ];
buildInputs = with pkgs; [ pkgconfig cmake zlib file perl curl ];
meta = with stdenv.lib; {
description = "A cat(1) clone with syntax highlighting and Git integration";
homepage = https://github.com/sharkdp/bat;
license = licenses.mit;
maintainers = [];
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ dywedir ];
platforms = platforms.linux;
};
}

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

@ -23,8 +23,13 @@ buildGoPackage rec {
goDeps = ./deps.nix;
patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim
sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
sed -i -e "s|expand('<sfile>:h:h')|'$bin'|" plugin/fzf.vim
# Original and output files can't be the same
if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then
echo "Vim plugin patch not applied properly. Aborting" && \
exit 1
fi
'';
preInstall = ''

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

@ -2214,6 +2214,8 @@ with pkgs;
exiftool = perlPackages.ImageExifTool;
ext4magic = callPackage ../tools/filesystems/ext4magic { };
extundelete = callPackage ../tools/filesystems/extundelete { };
expect = callPackage ../tools/misc/expect { };
@ -15937,6 +15939,14 @@ with pkgs;
inherit (gnome3) dconf;
};
gnucash24 = callPackage ../applications/office/gnucash/2.4.nix {
inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
gconf = gnome2.GConf;
guile = guile_1_8;
slibGuile = slibGuile.override { scheme = guile_1_8; };
goffice = goffice_0_8;
};
gnucash26 = lowPrio (callPackage ../applications/office/gnucash/2.6.nix {
inherit (gnome2) libgnomecanvas;
inherit (gnome3) dconf;
@ -16023,6 +16033,8 @@ with pkgs;
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { };
grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
gtkpod = callPackage ../applications/audio/gtkpod { };
@ -20386,7 +20398,9 @@ with pkgs;
pythia = callPackage ../development/libraries/physics/pythia { };
rivet = callPackage ../development/libraries/physics/rivet { };
rivet = callPackage ../development/libraries/physics/rivet {
imagemagick = graphicsmagick-imagemagick-compat;
};
thepeg = callPackage ../development/libraries/physics/thepeg { };

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

@ -159,7 +159,7 @@ in rec {
(name: ! builtins.elem name integerSimpleExcludes)
(pkgs.lib.attrNames packages);
in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
ghc = compiler.integer-simple."${name}";
ghc = bh.compiler.integer-simple."${name}";
overrides = _self : _super : {
integer-simple = null;
integer-gmp = null;