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

Merge staging into master

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-06-23 08:23:59 +02:00
commit cdfbfc1d09
28 changed files with 2121 additions and 1439 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/systems/examples.nix
View File

@ -32,13 +32,15 @@ rec {
armv5te-android-prebuilt = rec {
config = "armv5tel-unknown-linux-androideabi";
sdkVer = "21";
ndkVer = "10e";
platform = platforms.armv5te-android;
useAndroidPrebuilt = true;
};
armv7a-android-prebuilt = rec {
config = "armv7a-unknown-linux-androideabi";
sdkVer = "21";
sdkVer = "24";
ndkVer = "17";
platform = platforms.armv7a-android;
useAndroidPrebuilt = true;
};
@ -46,6 +48,7 @@ rec {
aarch64-android-prebuilt = rec {
config = "aarch64-unknown-linux-android";
sdkVer = "24";
ndkVer = "17";
platform = platforms.aarch64-multiplatform;
useAndroidPrebuilt = true;
};

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

@ -13,9 +13,9 @@ let
sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq";
};
latestVersion = {
version = "3.2.0.17"; # "Android Studio 3.2 Canary 18"
build = "181.4830125";
sha256Hash = "14yarl1vqhy21ljrn5k2dy8z0y407g9nqw4lqzjbxb7zmascnlx4";
version = "3.2.0.18"; # "Android Studio 3.2 Beta 1"
build = "181.4847800";
sha256Hash = "1ipdvrx3qxwygq72jlf0dl4haxviscl41q18kclg519r1zbzd4cw";
};
in rec {
# Old alias
@ -40,7 +40,7 @@ in rec {
};
});
beta = mkStudio (stableVersion // {
beta = mkStudio (latestVersion // {
pname = "android-studio-preview";
#pname = "android-studio-beta"; # TODO: Rename and provide symlink

794
pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/qutebrowser/default.nix
View File

@ -29,13 +29,13 @@ let
in python3Packages.buildPythonApplication rec {
name = "qutebrowser-${version}${versionPostfix}";
namePrefix = "";
version = "1.3.2";
version = "1.3.3";
versionPostfix = "";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
sha256 = "0zy2cm85qq095hk94d8jk6yqpyy0f31vb2pfbdpgg93b9vvzajzz";
sha256 = "01lrbkddm4wagx4hq6cz5qwvb8q8nlz0xa35k317gvr3pmnvgjk8";
};
# Needs tox

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

@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.17.1";
version = "2.18.0";
svn = subversionClient.override { perlBindings = perlSupport; };
in
@ -27,7 +27,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr";
sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b";
};
outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
@ -40,7 +40,6 @@ stdenv.mkDerivation {
patches = [
./docbook2texi.patch
./symlinks-in-bin.patch
./git-sh-i18n.patch
./ssh-path.patch
./git-send-email-honor-PATH.patch
@ -277,10 +276,21 @@ EOF
# XXX: I failed to understand why this one fails.
# Could someone try to re-enable it on the next release ?
# Tested to fail: 2.18.0
disable_test t1700-split-index "null sha1"
# Tested to fail: 2.18.0
disable_test t7005-editor "editor with a space"
disable_test t7005-editor "core.editor with a space"
# Tested to fail: 2.18.0
disable_test t9902-completion "sourcing the completion script clears cached --options"
'' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
# Test fails (as of 2.17.0, musl 1.1.19)
disable_test t3900-i18n-commit
# Fails largely due to assumptions about BOM
# Tested to fail: 2.18.0
disable_test t0028-working-tree-encoding
'';

13
pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
View File

@ -1,13 +0,0 @@
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -2609,8 +2609,7 @@
{ test "$$bindir/" = "$$execdir/" || \
for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
$(RM) "$$execdir/$$p" && \
- test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
- ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+ ln -s "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
done; \
} && \

8
pkgs/applications/window-managers/i3/gaps.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, i3, autoreconfHook }:
i3.overrideDerivation (super : rec {
i3.overrideAttrs (oldAttrs : rec {
name = "i3-gaps-${version}";
version = "4.15.0.1";
@ -11,7 +11,7 @@ i3.overrideDerivation (super : rec {
sha256 = "16s6bink8yj3zix4vww64b745d5drf2vqjg8vz3pwzrark09hfal";
};
nativeBuildInputs = super.nativeBuildInputs ++ [ autoreconfHook ];
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ];
postUnpack = ''
echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
@ -19,7 +19,6 @@ i3.overrideDerivation (super : rec {
# fatal error: GENERATED_config_enums.h: No such file or directory
enableParallelBuilding = false;
}) // {
meta = with stdenv.lib; {
description = "A fork of the i3 tiling window manager with some additional features";
@ -36,5 +35,4 @@ i3.overrideDerivation (super : rec {
Configured via plain text file. Multi-monitor. UTF-8 clean.
'';
};
}
})

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

@ -1053,6 +1053,10 @@ self: super: {
# dhall-json requires a very particular dhall version
dhall-json_1_2_0 = super.dhall-json_1_2_0.override { dhall = self.dhall_1_14_0; };
# https://github.com/fpco/streaming-commons/issues/49
streaming-commons = dontCheck super.streaming-commons;
}
//
@ -1071,14 +1075,3 @@ self: super: {
in {
inherit amazonka amazonka-core amazonka-test;
})
//
# The actual Cabal library gets built while building its `Setup.hs`.
(let
inherit (pkgs.lib) filterAttrs flip mapAttrs hasPrefix;
cabals = filterAttrs (n: v: hasPrefix "Cabal_" n) super;
fixCabal = n: v: addSetupDepends v [ self.mtl self.parsec ];
in
mapAttrs fixCabal cabals
)

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

@ -38,7 +38,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 11.13
# LTS Haskell 11.14
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -66,7 +66,7 @@ default-package-overrides:
- aeson ==1.2.4.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.1.0.5
- aeson-compat ==0.3.7.1
- aeson-compat ==0.3.8
- aeson-diff ==1.1.0.5
- aeson-extra ==0.4.1.0
- aeson-generic-compat ==0.0.1.2
@ -203,7 +203,7 @@ default-package-overrides:
- asn1-parse ==0.9.4
- asn1-types ==0.3.2
- assert-failure ==0.1.2.2
- astro ==0.4.2.0
- astro ==0.4.2.1
- async ==2.1.1.1
- async-extra ==0.2.0.0
- async-refresh ==0.2.0.2
@ -216,9 +216,11 @@ default-package-overrides:
- attoparsec ==0.13.2.2
- attoparsec-binary ==0.2
- attoparsec-expr ==0.1.1.2
- attoparsec-ip ==0.0.1
- attoparsec-iso8601 ==1.0.0.0
- attoparsec-path ==0.0.0.1
- attoparsec-time ==1
- attoparsec-uri ==0.0.4
- audacity ==0.0.2
- authenticate ==1.3.4
- authenticate-oauth ==1.6
@ -296,7 +298,7 @@ default-package-overrides:
- blastxml ==0.3.2
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.1.0
- blaze-html ==0.9.0.1
- blaze-html ==0.9.1.1
- blaze-markup ==0.8.2.1
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
@ -325,7 +327,7 @@ default-package-overrides:
- bson-lens ==0.1.1
- btrfs ==0.1.2.3
- buchhaltung ==0.0.7
- buffer-builder ==0.2.4.5
- buffer-builder ==0.2.4.6
- buffer-pipe ==0.0
- butcher ==1.3.0.0
- bv ==0.5
@ -568,7 +570,7 @@ default-package-overrides:
- dependent-sum ==0.4
- dependent-sum-template ==0.0.0.6
- deque ==0.2.1
- deriving-compat ==0.4.2
- deriving-compat ==0.4.3
- descriptive ==0.9.4
- dhall ==1.11.1
- dhall-json ==1.0.13
@ -588,7 +590,7 @@ default-package-overrides:
- disposable ==0.2.0.4
- distance ==0.1.0.0
- distributed-closure ==0.4.0
- distributed-process ==0.7.3
- distributed-process ==0.7.4
- distributed-process-lifted ==0.3.0.1
- distributed-process-monad-control ==0.5.1.3
- distributed-process-simplelocalnet ==0.2.4
@ -880,6 +882,7 @@ default-package-overrides:
- grouped-list ==0.2.2.0
- groups ==0.4.1.0
- gtk2hs-buildtools ==0.13.4.0
- gym-http-api ==0.1.0.1
- H ==0.9.0.1
- h2c ==1.0.0
- hackage-db ==2.0
@ -892,7 +895,7 @@ default-package-overrides:
- hamilton ==0.1.0.2
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- hapistrano ==0.3.5.6
- hapistrano ==0.3.5.7
- happstack-jmacro ==7.0.12
- happstack-server ==7.5.1
- happstack-server-tls ==7.1.6.5
@ -986,7 +989,7 @@ default-package-overrides:
- hmatrix-backprop ==0.1.2.0
- hmatrix-gsl ==0.18.2.0
- hmatrix-gsl-stats ==0.4.1.7
- hmatrix-morpheus ==0.1.1.1
- hmatrix-morpheus ==0.1.1.2
- hmatrix-repa ==0.1.2.2
- hmatrix-special ==0.4.0.1
- hmatrix-vector-sized ==0.1.1.0
@ -1018,8 +1021,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
@ -1027,7 +1030,7 @@ default-package-overrides:
- HSlippyMap ==3.0.1
- hslogger ==1.2.10
- hslua ==0.9.5.2
- hslua-aeson ==0.3.0.1
- hslua-aeson ==0.3.0.2
- hslua-module-text ==0.1.2.1
- hsndfile ==0.8.0
- hsndfile-vector ==0.5.2
@ -1066,10 +1069,10 @@ default-package-overrides:
- html-email-validate ==0.2.0.0
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- HTTP ==4000.3.11
- HTTP ==4000.3.12
- http2 ==1.6.3
- http-api-data ==0.3.7.2
- http-client ==0.5.12.1
- http-client ==0.5.13
- http-client-openssl ==0.2.1.1
- http-client-tls ==0.3.5.3
- http-common ==0.8.2.0
@ -1167,6 +1170,7 @@ default-package-overrides:
- io-storage ==0.3
- io-streams ==1.5.0.1
- io-streams-haproxy ==1.0.0.2
- ip ==1.2.1
- ip6addr ==0.5.3
- iproute ==1.7.5
- IPv6Addr ==1.0.3
@ -1180,7 +1184,7 @@ default-package-overrides:
- islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8
- iso639 ==0.1.0.3
- iso8601-time ==0.1.4
- iso8601-time ==0.1.5
- iterable ==3.0
- ixset ==1.0.7
- ixset-typed ==0.3.1.1
@ -1235,7 +1239,7 @@ default-package-overrides:
- language-haskell-extract ==0.2.4
- language-java ==0.2.9
- language-javascript ==0.6.0.11
- language-puppet ==1.3.17
- language-puppet ==1.3.18
- lapack-carray ==0.0.2
- lapack-ffi ==0.0.2
- lapack-ffi-tools ==0.1.0.1
@ -1327,6 +1331,7 @@ default-package-overrides:
- markdown ==0.1.17.1
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- markup ==4.0.4
- marvin-interpolate ==1.1.2
- massiv ==0.1.6.1
- massiv-io ==0.1.4.0
@ -1463,7 +1468,7 @@ default-package-overrides:
- netlib-carray ==0.0.1.1
- netlib-ffi ==0.0.1
- netpbm ==1.0.2
- nettle ==0.2.0
- nettle ==0.2.1
- netwire ==5.0.3
- netwire-input ==0.0.7
- netwire-input-glfw ==0.0.10
@ -1610,7 +1615,7 @@ default-package-overrides:
- picosat ==0.1.4
- pid1 ==0.1.2.0
- pinboard ==0.9.12.10
- pinch ==0.3.2.0
- pinch ==0.3.3.0
- pipes ==4.3.9
- pipes-aeson ==0.4.1.8
- pipes-attoparsec ==0.5.1.5
@ -1669,7 +1674,7 @@ default-package-overrides:
- prettyclass ==1.0.0.0
- pretty-class ==1.0.1.1
- pretty-hex ==1.0
- prettyprinter ==1.2.0.1
- prettyprinter ==1.2.1
- prettyprinter-ansi-terminal ==1.1.1.2
- prettyprinter-compat-annotated-wl-pprint ==1
- prettyprinter-compat-ansi-wl-pprint ==1.0.1
@ -1722,7 +1727,8 @@ default-package-overrides:
- QuickCheck ==2.10.1
- quickcheck-arbitrary-adt ==0.3.1.0
- quickcheck-assertions ==0.3.0
- quickcheck-combinators ==0.0.2
- quickcheck-classes ==0.4.12
- quickcheck-combinators ==0.0.4
- quickcheck-instances ==0.3.18
- quickcheck-io ==0.2.0
- quickcheck-properties ==0.1
@ -1788,7 +1794,7 @@ default-package-overrides:
- regex-tdfa-text ==1.0.0.3
- reinterpret-cast ==0.1.0
- relational-query ==0.11.1.0
- relational-query-HDBC ==0.6.7.0
- relational-query-HDBC ==0.6.7.1
- relational-record ==0.2.1.2
- relational-schemas ==0.1.6.1
- rematch ==0.2.0.0
@ -1860,6 +1866,7 @@ default-package-overrides:
- semigroupoid-extras ==5
- semigroupoids ==5.2.2
- semigroups ==0.18.4
- semirings ==0.1.3.0
- semiring-simple ==1.0.0.1
- semver ==0.3.3.1
- sendfile ==0.7.9
@ -1915,7 +1922,7 @@ default-package-overrides:
- shortcut-links ==0.4.2.0
- should-not-typecheck ==2.1.0
- show-combinators ==0.1.0.0
- show-prettyprint ==0.2.0.2
- show-prettyprint ==0.2.2
- signal ==0.1.0.4
- silently ==1.2.5
- simple ==0.11.2
@ -1931,11 +1938,11 @@ default-package-overrides:
- skein ==1.0.9.4
- skeletons ==0.4.0
- skylighting ==0.6
- slack-web ==0.2.0.4
- slack-web ==0.2.0.5
- slave-thread ==1.0.2
- slug ==0.1.7
- smallcheck ==1.1.4
- smoothie ==0.4.2.8
- smoothie ==0.4.2.9
- smtp-mail ==0.1.4.6
- snap ==1.1.0.0
- snap-blaze ==0.2.1.5
@ -1966,14 +1973,14 @@ default-package-overrides:
- split ==0.2.3.3
- splitmix ==0
- Spock ==0.12.0.0
- Spock-api ==0.12.0.0
- Spock-api-server ==0.12.0.0
- Spock-api ==0.12.0.1
- Spock-api-server ==0.12.0.1
- Spock-core ==0.12.0.0
- Spock-lucid ==0.4.0.1
- Spock-worker ==0.3.1.0
- spoon ==0.3.1
- spreadsheet ==0.1.3.7
- sqlite-simple ==0.4.15.0
- sqlite-simple ==0.4.16.0
- sql-words ==0.1.6.1
- squeal-postgresql ==0.1.1.4
- srcloc ==0.5.1.2
@ -2006,7 +2013,7 @@ default-package-overrides:
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13
- store ==0.4.3.2
- store-core ==0.4.3
- store-core ==0.4.4
- Strafunski-StrategyLib ==5.0.1.0
- stratosphere ==0.19.1
- streaming ==0.2.1.0
@ -2132,7 +2139,7 @@ default-package-overrides:
- threads ==0.5.1.6
- threads-extras ==0.1.0.2
- threepenny-editors ==0.5.6
- threepenny-gui ==0.8.2.3
- threepenny-gui ==0.8.2.4
- threepenny-gui-flexbox ==0.4.2
- th-reify-compat ==0.0.1.4
- th-reify-many ==0.1.8
@ -2248,6 +2255,7 @@ default-package-overrides:
- uri-bytestring-aeson ==0.1.0.6
- uri-encode ==1.5.0.5
- uri-templater ==0.3.1.0
- urlpath ==8.1.0
- userid ==0.1.3.2
- users ==0.5.0.0
- users-postgresql-simple ==0.5.0.2
@ -2257,7 +2265,7 @@ default-package-overrides:
- utility-ht ==0.0.14
- uuid ==1.3.13
- uuid-types ==1.0.3
- vado ==0.0.9
- vado ==0.0.10
- validation ==1
- validationt ==0.2.0.0
- validity ==0.4.0.4
@ -2340,7 +2348,7 @@ default-package-overrides:
- web-routes-th ==0.22.6.3
- web-routes-wai ==0.24.3.1
- webrtc-vad ==0.1.0.3
- websockets ==0.12.5.0
- websockets ==0.12.5.1
- websockets-rpc ==0.6.0
- websockets-simple ==0.0.6.3
- websockets-snap ==0.10.3.0
@ -2644,6 +2652,7 @@ dont-distribute-packages:
accelerate-fourier-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ]
accelerate-llvm-ptx: [ i686-linux, x86_64-linux, x86_64-darwin ]
bindings-yices: [ i686-linux, x86_64-linux, x86_64-darwin ]
boolector: [ i686-linux, x86_64-linux, x86_64-darwin ]
ccelerate-cuda: [ i686-linux, x86_64-linux, x86_64-darwin ]
cublas: [ i686-linux, x86_64-linux, x86_64-darwin ]
cufft: [ i686-linux, x86_64-linux, x86_64-darwin ]

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -98,7 +98,7 @@ let
else "package-conf";
# the target dir for haddock documentation
docdir = docoutput: docoutput + "/share/doc";
docdir = docoutput: docoutput + "/share/doc/" + pname + "-" + version;
newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
newCabalFile = fetchurl {

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

File diff suppressed because it is too large Load Diff

16
pkgs/development/haskell-modules/hoogle.nix
View File

@ -52,13 +52,10 @@ let
This index includes documentation for many Haskell modules.
'';
# Packages like base and bytestring are null. These must be removed
# to prevent eval errors.
nonNullPackages = builtins.filter (p: p != null) packages;
# TODO: closePropagation is deprecated; replace
docPackages = lib.closePropagation
# we grab the doc outputs
(map (lib.getOutput "doc") nonNullPackages);
(map (lib.getOutput "doc") packages);
in
stdenv.mkDerivation {
@ -70,10 +67,10 @@ stdenv.mkDerivation {
inherit docPackages;
buildPhase = ''
${lib.optionalString (nonNullPackages != [] -> docPackages == [])
${lib.optionalString (packages != [] -> docPackages == [])
("echo WARNING: localHoogle package list empty, even though"
+ " the following were specified: "
+ lib.concatMapStringsSep ", " (p: p.name) nonNullPackages)}
+ lib.concatMapStringsSep ", " (p: p.name) packages)}
mkdir -p $out/share/doc/hoogle
echo importing builtin packages
@ -89,9 +86,10 @@ stdenv.mkDerivation {
${lib.concatMapStringsSep "\n" (el: ''
ln -sfn ${el.haddockDir} "$out/share/doc/hoogle/${el.name}"
'')
(builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null;
name = p.pname; })
docPackages)}
(lib.filter (el: el.haddockDir != null)
(builtins.map (p: { haddockDir = if p ? haddockDir then p.haddockDir p else null;
name = p.pname; })
docPackages))}
echo building hoogle database
hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle

12
pkgs/development/interpreters/luajit/default.nix
View File

@ -7,10 +7,8 @@ rec {
version = "2.0.5";
isStable = true;
sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7";
} // {
# 64-bit ARM isn't supported upstream
meta = meta // {
platforms = lib.filter (p: p != "aarch64-linux") meta.platforms;
meta = genericMeta // {
platforms = lib.filter (p: p != "aarch64-linux") genericMeta.platforms;
};
};
@ -20,13 +18,12 @@ rec {
sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs";
};
meta = with stdenv.lib; {
genericMeta = with stdenv.lib; {
description = "High-performance JIT compiler for Lua 5.1";
homepage = http://luajit.org;
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers ; [ thoughtpolice smironov vcunat andir ];
maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ];
};
generic =
@ -37,6 +34,7 @@ rec {
url = "http://luajit.org/download/LuaJIT-${version}.tar.gz";
inherit sha256;
})
, meta ? genericMeta
}:
stdenv.mkDerivation rec {

5
pkgs/development/libraries/libcollectdclient/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, collectd }:
with stdenv.lib;
overrideDerivation collectd (oldAttrs: {
collectd.overrideAttrs (oldAttrs: {
name = "libcollectdclient-${collectd.version}";
buildInputs = [ ];
@ -16,7 +16,6 @@ overrideDerivation collectd (oldAttrs: {
postInstall = "rm -rf $out/{bin,etc,sbin,share}";
}) // {
meta = with stdenv.lib; {
description = "C Library for collectd, a daemon which collects system performance statistics periodically";
homepage = http://collectd.org;
@ -24,4 +23,4 @@ overrideDerivation collectd (oldAttrs: {
platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable?
maintainers = [ maintainers.sheenobu maintainers.bjornfor ];
};
}
})

9
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
{ stdenv, fetchurl, fetchpatch, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
stdenv.mkDerivation rec {
name = "libtorrent-rasterbar-${version}";
@ -11,6 +11,13 @@ stdenv.mkDerivation rec {
sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
};
patches = [
(fetchpatch {
url = "https://github.com/arvidn/libtorrent/commit/64d6b4900448097b0157abb328621dd211e2947d.patch";
sha256 = "0d4h0g129rsgm8xikybxypgv6nnya7ap7kskl7q78p4h6y2a0fhc";
})
];
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boost openssl zlib python libiconv geoip ];

2
pkgs/development/mobile/androidenv/androidndk-pkgs.nix
View File

@ -23,7 +23,7 @@ let
"armv7a-unknown-linux-androideabi" = {
arch = "arm";
triple = "arm-linux-androideabi";
gccVer = "4.8";
gccVer = "4.9";
};
"aarch64-unknown-linux-android" = {
arch = "arm64";

18
pkgs/development/mobile/androidenv/androidndk.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper
{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
, platformTools, python3, libcxx, version, sha256
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
phases = "buildPhase";
nativeBuildInputs = [ p7zip makeWrapper file ];
nativeBuildInputs = [ unzip makeWrapper file ];
buildCommand = let
bin_path = "$out/bin";
@ -32,11 +32,8 @@ stdenv.mkDerivation rec {
]) + ":${platformTools}/platform-tools";
in ''
mkdir -pv $out/libexec
mkdir -pv $out/lib64
ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5
ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5
cd $out/libexec
7z x $src
unzip -qq $src
patchShebangs ${pkg_path}
@ -58,11 +55,16 @@ stdenv.mkDerivation rec {
}
cd ${pkg_path}
find $out \( \
# Steps to reduce output size
rm -rf docs sources tests
# We only support cross compiling with gcc for now
rm -rf toolchains/*-clang* toolchains/llvm*
find ${pkg_path}/toolchains \( \
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
--set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \;
--set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
# fix ineffective PROGDIR / MYNDKDIR determination
for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
do

7
pkgs/development/mobile/androidenv/androidndk_r8e.nix
View File

@ -49,7 +49,12 @@ stdenv.mkDerivation rec {
-d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
cd ${pkg_path}
find $out \( \
# Steps to reduce output size
rm -rf docs sources tests
# We only support cross compiling with gcc for now
rm -rf toolchains/*-clang* toolchains/llvm-*
find ${pkg_path}/toolchains \( \
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \

18
pkgs/development/mobile/androidenv/default.nix
View File

@ -226,7 +226,7 @@ rec {
androidndk_10e = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;
@ -237,7 +237,7 @@ rec {
androidndk_16b = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;
@ -246,9 +246,9 @@ rec {
sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw";
};
androidndk = import ./androidndk.nix {
androidndk_17 = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;
@ -256,6 +256,7 @@ rec {
version = "17";
sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds";
};
androidndk = androidndk_17;
androidndk_r8e = import ./androidndk_r8e.nix {
inherit (buildPackages)
@ -276,7 +277,7 @@ rec {
inherit androidsdk;
};
androidndkPkgs = import ./androidndk-pkgs.nix {
androidndkPkgs_17 = import ./androidndk-pkgs.nix {
inherit (buildPackages)
makeWrapper;
inherit (pkgs)
@ -286,10 +287,11 @@ rec {
# but for splicing messing up on infinite recursion for the variants we
# *dont't* use. Using this workaround, but also making a test to ensure
# these two really are the same.
buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk;
inherit androidndk;
targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs;
buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_17;
androidndk = androidndk_17;
targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_17;
};
androidndkPkgs = androidndkPkgs_17;
androidndkPkgs_10e = import ./androidndk-pkgs.nix {
inherit (buildPackages)

13
pkgs/development/python-modules/thumbor/default.nix
View File

@ -1,26 +1,19 @@
{ buildPythonPackage, stdenv, tornado, pycrypto, pycurl, pytz
, pillow, derpconf, python_magic, pexif, libthumbor, opencv, webcolors
, piexif, futures, statsd, thumborPexif, fetchPypi, fetchpatch, isPy3k, lib
, piexif, futures, statsd, thumborPexif, fetchPypi, isPy3k, lib
}:
buildPythonPackage rec {
pname = "thumbor";
version = "6.4.2";
version = "6.5.1";
disabled = isPy3k; # see https://github.com/thumbor/thumbor/issues/1004
src = fetchPypi {
inherit pname version;
sha256 = "0y9mf78j80vjh4y0xvgnybc1wqfcwm5s19xhsfgkn12hh8pmh14d";
sha256 = "0yalqwpxb6m0dz2qfnyv1pqqd5dd020wl7hc0n0bvsvxg1ib9if0";
};
patches = [
(fetchpatch {
url = "https://github.com/thumbor/thumbor/commit/4f2bc99451409e404f7fa0f3e4a3bdaea7b49869.patch";
sha256 = "0qqw1n1pfd8f8cn168718gzwf4b35j2j9ajyw643xpf92s0iq2cc";
})
];
postPatch = ''
substituteInPlace "setup.py" \
--replace '"argparse",' "" ${lib.optionalString isPy3k ''--replace '"futures",' ""''}

1
pkgs/servers/nosql/influxdb/default.nix
View File

@ -27,6 +27,5 @@ buildGoPackage rec {
license = licenses.mit;
homepage = https://influxdb.com/;
maintainers = with maintainers; [ offline zimbatm ];
platforms = platforms.linux;
};
}

9
pkgs/servers/x11/xorg/xwayland.nix
View File

@ -1,9 +1,8 @@
{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
with stdenv.lib;
overrideDerivation xorgserver (oldAttrs: {
xorgserver.overrideAttrs (oldAttrs: {
name = "xwayland-${xorgserver.version}";
propagatedBuildInputs = oldAttrs.propagatedBuildInputs
@ -28,14 +27,10 @@ overrideDerivation xorgserver (oldAttrs: {
rm -fr $out/share/X11/xkb/compiled
'';
}) // {
meta = {
description = "An X server for interfacing X11 apps with the Wayland protocol";
homepage = http://wayland.freedesktop.org/xserver.html;
license = licenses.mit;
platforms = platforms.linux;
};
}
})

6
pkgs/stdenv/cross/default.nix
View File

@ -41,10 +41,8 @@ in lib.init bootStages ++ [
targetPlatform = crossSystem;
cc = if crossSystem.useiOSPrebuilt or false
then buildPackages.darwin.iosSdkPkgs.clang
else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit)
then buildPackages.androidenv.androidndkPkgs_10e.gcc
else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit)
then buildPackages.androidenv.androidndkPkgs.gcc
else if crossSystem.useAndroidPrebuilt
then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
else buildPackages.gcc;
};
})

60
pkgs/tools/misc/libcpuid/default.nix
View File

@ -1,10 +1,5 @@
{ stdenv
, fetchFromGitHub
, libtool
, automake
, autoconf
, python2 # Needed for tests
}:
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
name = "libcpuid-${version}";
version = "0.4.0";
@ -16,51 +11,18 @@ stdenv.mkDerivation rec {
sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7";
};
patchPhase = ''
libtoolize
autoreconf --install
'';
configurePhase = ''
mkdir -p Install
./configure --prefix=$(pwd)/Install
substituteInPlace Makefile --replace "/usr/local" "$out"
'';
buildPhase = ''
make all
'';
postInstall = ''
pushd Install
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/lib ${python2.interpreter} ../tests/run_tests.py ./bin/cpuid_tool ../tests/
popd
function fixRunPath {
p0=$(patchelf --print-rpath $1)
p1=$(echo $p0 | sed -re 's#.*Install/lib:##g')
patchelf --set-rpath $p1 $1
}
fixRunPath Install/bin/cpuid_tool
mkdir -p $out
sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc
cp -r Install/* $out
cp -r tests $out
'';
nativeBuildInputs = [
libtool
automake
autoconf
patches = [
# Work around https://github.com/anrieff/libcpuid/pull/102.
./stdint.patch
];
nativeBuildInputs = [ autoreconfHook ];
meta = with stdenv.lib; {
homepage = http://libcpuid.sourceforge.net/;
description = "a small C library for x86 CPU detection and feature extraction";
license = licenses.bsd3;
maintainers = with maintainers; [ artuuge ];
description = "A small C library for x86 CPU detection and feature extraction";
license = licenses.bsd2;
maintainers = with maintainers; [ orivej artuuge ];
platforms = platforms.all;
};
}

5
pkgs/tools/misc/libcpuid/stdint.patch Normal file
View File

@ -0,0 +1,5 @@
--- a/libcpuid/libcpuid.h
+++ b/libcpuid/libcpuid.h
@@ -88 +88 @@
-#include "libcpuid_types.h"
+#include <stdint.h>

50
pkgs/tools/networking/gnirehtet/default.nix Normal file
View File

@ -0,0 +1,50 @@
{stdenv, rustPlatform, fetchFromGitHub, fetchzip, androidenv, substituteAll}:
let
version = "2.2.1";
apk = stdenv.mkDerivation {
name = "gnirehtet.apk-${version}";
src = fetchzip {
url = "https://github.com/Genymobile/gnirehtet/releases/download/v${version}/gnirehtet-rust-linux64-v${version}.zip";
sha256 = "1rz2wdjc1y7n8fhskmki1nj0ak80ylxspcsrcdnjkk9r7jbq0kan";
};
installPhase = ''
mkdir $out
mv gnirehtet.apk $out
'';
};
in
rustPlatform.buildRustPackage rec {
name = "gnirehtet-${version}";
src = fetchFromGitHub {
owner = "Genymobile";
repo = "gnirehtet";
rev = "v${version}";
sha256 = "1mv8nq4422k2d766qjqqnqp47qzzbbvlwhdni0k6w4nmd3m5cnd9";
};
sourceRoot = "source/relay-rust";
cargoSha256 = "11qf9n6h6akvb0rbmsgdlfmypkbnas8ss1cs7i8w19mh7524n0v5";
patchFlags = [ "-p2" ];
patches = [
(substituteAll {
src = ./paths.patch;
adb = "${androidenv.platformTools}/bin/adb";
inherit apk;
})
];
meta = with stdenv.lib; {
description = "Reverse tethering over adb for Android";
longDescription = ''
This project provides reverse tethering over adb for Android: it allows devices to use the internet connection of the computer they are plugged on. It does not require any root access (neither on the device nor on the computer).
This relies on adb, make sure you have the required permissions/udev rules.
'';
homepage = https://github.com/Genymobile/gnirehtet;
license = licenses.asl20;
maintainers = with maintainers; [ symphorien ];
platforms = platforms.unix;
};
}

35
pkgs/tools/networking/gnirehtet/paths.patch Normal file
View File

@ -0,0 +1,35 @@
diff --git a/relay-rust/src/main.rs b/relay-rust/src/main.rs
index 4f1be53..96d2e78 100644
--- a/relay-rust/src/main.rs
+++ b/relay-rust/src/main.rs
@@ -299,7 +299,7 @@ impl Command for RelayCommand {
fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> {
info!(target: TAG, "Installing gnirehtet client...");
- exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"])
+ exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"])
}
fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> {
@@ -467,8 +467,8 @@ fn exec_adb<S: Into<String>>(
args: Vec<S>,
) -> Result<(), CommandExecutionError> {
let adb_args = create_adb_args(serial, args);
- debug!(target: TAG, "Execute: adb {:?}", adb_args);
- match process::Command::new("adb").args(&adb_args[..]).status() {
+ debug!(target: TAG, "Execute: @adb@ {:?}", adb_args);
+ match process::Command::new("@adb@").args(&adb_args[..]).status() {
Ok(exit_status) => {
if exit_status.success() {
Ok(())
@@ -490,8 +490,8 @@ fn must_install_client(serial: Option<&String>) -> Result<bool, CommandExecution
serial,
vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"],
);
- debug!(target: TAG, "Execute: adb {:?}", args);
- match process::Command::new("adb").args(&args[..]).output() {
+ debug!(target: TAG, "Execute: @adb@ {:?}", args);
+ match process::Command::new("@adb@").args(&args[..]).output() {
Ok(output) => {
if output.status.success() {
// the "regex" crate makes the binary far bigger, so just parse the versionCode

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

@ -2656,6 +2656,8 @@ with pkgs;
stdenv = overrideCC stdenv gcc49;
};
gnirehtet = callPackage ../tools/networking/gnirehtet { };
gnome15 = callPackage ../applications/misc/gnome15 {
inherit (gnome2) gnome_python gnome_python_desktop;
};
@ -8697,7 +8699,7 @@ with pkgs;
# TODO(@Ericson2314): Build bionic libc from source
bionic = assert hostPlatform.useAndroidPrebuilt;
androidenv.androidndkPkgs.libraries;
androidenv."androidndkPkgs_${hostPlatform.ndkVer}".libraries;
bobcat = callPackage ../development/libraries/bobcat { };
@ -16559,6 +16561,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
});
inherit (nodePackages) imapnotify;
# Impressive, formerly known as "KeyJNote".
impressive = callPackage ../applications/office/impressive { };