Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 74854265b180
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 641ef3ab237b
Choose a head ref
18 contributors
Loading
Showing with 367 additions and 194 deletions.
  1. +38 −0 nixos/modules/installer/virtualbox-demo.nix
  2. +9 −0 nixos/modules/profiles/clone-config.nix
  3. +31 −4 nixos/modules/services/web-servers/nginx/default.nix
  4. +4 −4 pkgs/applications/editors/jetbrains/default.nix
  5. +2 −2 pkgs/applications/editors/rstudio/default.nix
  6. +13 −8 pkgs/applications/graphics/avocode/default.nix
  7. +11 −3 pkgs/applications/office/todoman/default.nix
  8. +17 −6 pkgs/applications/version-management/pijul/default.nix
  9. +61 −0 pkgs/applications/version-management/pijul/libpijul.patch
  10. +47 −26 pkgs/build-support/rust/default-crate-overrides.nix
  11. +2 −2 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
  12. +2 −2 pkgs/development/compilers/crystal/default.nix
  13. +0 −9 pkgs/development/compilers/mono/4.0.nix
  14. +0 −8 pkgs/development/compilers/mono/4.4.nix
  15. +2 −2 pkgs/development/interpreters/racket/default.nix
  16. +1 −1 pkgs/development/interpreters/racket/minimal.nix
  17. +4 −2 pkgs/development/libraries/qjson/default.nix
  18. +2 −2 pkgs/development/libraries/qoauth/default.nix
  19. +5 −2 pkgs/development/libraries/qrupdate/default.nix
  20. +3 −2 pkgs/development/libraries/qt-3/default.nix
  21. +4 −3 pkgs/development/libraries/qt-mobility/default.nix
  22. +1 −1 pkgs/development/libraries/qtscriptgenerator/default.nix
  23. +4 −2 pkgs/development/libraries/readline/5.x.nix
  24. +4 −3 pkgs/development/libraries/silgraphite/graphite2.nix
  25. +5 −2 pkgs/development/libraries/sofia-sip/default.nix
  26. +5 −2 pkgs/development/libraries/t1lib/default.nix
  27. +4 −2 pkgs/development/libraries/taglib-extras/default.nix
  28. +2 −1 pkgs/development/libraries/taglib-sharp/default.nix
  29. +1 −2 pkgs/development/libraries/taglib/1.9.nix
  30. +3 −2 pkgs/development/libraries/tclap/default.nix
  31. +5 −2 pkgs/development/libraries/telepathy/farstream/default.nix
  32. +3 −2 pkgs/development/libraries/telepathy/glib/default.nix
  33. +1 −0 pkgs/development/libraries/tidyp/default.nix
  34. +3 −3 pkgs/development/libraries/xbase/default.nix
  35. +3 −2 pkgs/development/libraries/xine-lib/default.nix
  36. +3 −3 pkgs/development/ocaml-modules/fmt/default.nix
  37. +2 −2 pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
  38. +2 −2 pkgs/development/python-modules/icalendar/default.nix
  39. +18 −9 pkgs/development/ruby-modules/bundler-app/default.nix
  40. +9 −0 pkgs/development/ruby-modules/gem/default.nix
  41. +2 −2 pkgs/development/tools/ocaml/merlin/default.nix
  42. +2 −2 pkgs/os-specific/linux/zfs/default.nix
  43. +0 −48 pkgs/tools/misc/openopc/default.nix
  44. +25 −0 pkgs/tools/nix/nixdoc/default.nix
  45. +2 −12 pkgs/top-level/all-packages.nix
38 changes: 38 additions & 0 deletions nixos/modules/installer/virtualbox-demo.nix
View file
Original file line number Diff line number Diff line change
@@ -22,4 +22,42 @@ with lib;

powerManagement.enable = false;
system.stateVersion = mkDefault "18.03";

installer.cloneConfigExtra = ''
# Let demo build as a trusted user.
# nix.trustedUsers = [ "demo" ];
# Mount a VirtualBox shared folder.
# This is configurable in the VirtualBox menu at
# Machine / Settings / Shared Folders.
# fileSystems."/mnt" = {
# fsType = "vboxsf";
# device = "nameofdevicetomount";
# options = [ "rw" ];
# };
# By default, the NixOS VirtualBox demo image includes SDDM and Plasma.
# If you prefer another desktop manager or display manager, you may want
# to disable the default.
# services.xserver.desktopManager.plasma5.enable = lib.mkForce false;
# services.xserver.displayManager.sddm.enable = lib.mkForce false;
# Enable GDM/GNOME by uncommenting above two lines and two lines below.
# services.xserver.displayManager.gdm.enable = true;
# services.xserver.desktopManager.gnome3.enable = true;
# Set your time zone.
# time.timeZone = "Europe/Amsterdam";
# List packages installed in system profile. To search, run:
# \$ nix search wget
# environment.systemPackages = with pkgs; [
# wget vim
# ];
# Enable the OpenSSH daemon.
# services.openssh.enable = true;
system.stateVersion = mkDefault "18.03";
'';
}
9 changes: 9 additions & 0 deletions nixos/modules/profiles/clone-config.nix
View file
Original file line number Diff line number Diff line change
@@ -48,6 +48,8 @@ let
{
imports = [ ${toString config.installer.cloneConfigIncludes} ];
${config.installer.cloneConfigExtra}
}
'';

@@ -73,6 +75,13 @@ in
'';
};

installer.cloneConfigExtra = mkOption {
default = "";
description = ''
Extra text to include in the cloned configuration.nix included in this
installer.
'';
};
};

config = {
35 changes: 31 additions & 4 deletions nixos/modules/services/web-servers/nginx/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ let

configFile = pkgs.writeText "nginx.conf" ''
user ${cfg.user} ${cfg.group};
error_log stderr;
error_log ${cfg.logError};
daemon off;
${cfg.config}
@@ -341,6 +341,35 @@ in
";
};

logError = mkOption {
default = "stderr";
description = "
Configures logging.
The first parameter defines a file that will store the log. The
special value stderr selects the standard error file. Logging to
syslog can be configured by specifying the “syslog:” prefix.
The second parameter determines the level of logging, and can be
one of the following: debug, info, notice, warn, error, crit,
alert, or emerg. Log levels above are listed in the order of
increasing severity. Setting a certain log level will cause all
messages of the specified and more severe log levels to be logged.
If this parameter is omitted then error is used.
";
};

preStart = mkOption {
type = types.lines;
default = ''
test -d ${cfg.stateDir}/logs || mkdir -m 750 -p ${cfg.stateDir}/logs
test `stat -c %a ${cfg.stateDir}` = "750" || chmod 750 ${cfg.stateDir}
test `stat -c %a ${cfg.stateDir}/logs` = "750" || chmod 750 ${cfg.stateDir}/logs
chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
'';
description = "
Shell commands executed before the service's nginx is started.
";
};

config = mkOption {
default = "";
description = "
@@ -608,9 +637,7 @@ in
stopIfChanged = false;
preStart =
''
mkdir -p ${cfg.stateDir}/logs
chmod 700 ${cfg.stateDir}
chown -R ${cfg.user}:${cfg.group} ${cfg.stateDir}
${cfg.preStart}
${cfg.package}/bin/nginx -c ${configFile} -p ${cfg.stateDir} -t
'';
serviceConfig = {
8 changes: 4 additions & 4 deletions pkgs/applications/editors/jetbrains/default.nix
View file
Original file line number Diff line number Diff line change
@@ -289,25 +289,25 @@ in

idea-community = buildIdea rec {
name = "idea-community-${version}";
version = "2018.2.4"; /* updated by script */
version = "2018.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 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */
sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IntelliJ IDEA Release";
};

idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
version = "2018.2.4"; /* updated by script */
version = "2018.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 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */
sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IntelliJ IDEA Release";
4 changes: 2 additions & 2 deletions pkgs/applications/editors/rstudio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
let
verMajor = "1";
verMinor = "1";
verPatch = "456";
verPatch = "463";
version = "${verMajor}.${verMinor}.${verPatch}";
ginVer = "1.5";
gwtVer = "2.7.0";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "rstudio";
repo = "rstudio";
rev = "v${version}";
sha256 = "0hv07qrbjwapbjrkddasglsgk0x5j7qal468i5rv77krsp09s4fz";
sha256 = "014g984znsczzy1fyn9y1ly3rbsngryfs674lfgciz60mqnl8im6";
};

# Hack RStudio to only use the input R.
21 changes: 13 additions & 8 deletions pkgs/applications/graphics/avocode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{ stdenv, makeDesktopItem, fetchurl, unzip
, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
, xorg, mozjpeg
, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, xorg, mozjpeg, makeWrapper, gsettings-desktop-schemas
}:

stdenv.mkDerivation rec {
name = "avocode-${version}";
version = "3.4.0";
version = "3.6.2";

src = fetchurl {
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
sha256 = "1dk4vgam9r5nl8dvpfwrn52gq6r4zxs4zz63p3c4gk73d8qnh4dl";
sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
};

libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [
stdenv.cc.cc.lib
gdk_pixbuf
glib
gtk2
gtk3
atk
at-spi2-atk
pango
cairo
freetype
@@ -29,7 +30,6 @@ stdenv.mkDerivation rec {
cups
expat
udev
GConf
libX11
libxcb
libXi
@@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
comment = "The bridge between designers and developers";
};

buildInputs = [ unzip ];
nativeBuildInputs = [makeWrapper];
buildInputs = [ unzip gtk3 gsettings-desktop-schemas];

# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder
@@ -85,6 +86,10 @@ stdenv.mkDerivation rec {
for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
patchelf --set-rpath ${libPath}:$out/ $file
done
for file in $out/bin/*; do
wrapProgram $file \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings-desktop-schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done
'';

enableParallelBuilding = true;
14 changes: 11 additions & 3 deletions pkgs/applications/office/todoman/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ stdenv, python3, glibcLocales }:
{ stdenv, python3, glibcLocales, fetchpatch }:

let
inherit (python3.pkgs) buildPythonApplication fetchPypi;
in
buildPythonApplication rec {
pname = "todoman";
version = "3.4.0";
version = "3.4.1";
name = "${pname}-${version}";

src = fetchPypi {
inherit pname version;
sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw";
sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5";
};

LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux
@@ -29,9 +29,17 @@ buildPythonApplication rec {
makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive"
"--set CHARSET en_us.UTF-8" ];

patches = [
(fetchpatch {
url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch";
sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag";
})
];

preCheck = ''
# Remove one failing test that only checks whether the command line works
rm tests/test_main.py
rm tests/test_cli.py
'';

meta = with stdenv.lib; {
23 changes: 17 additions & 6 deletions pkgs/applications/version-management/pijul/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
{ stdenv, fetchurl, rustPlatform, darwin }:
{ stdenv, fetchurl, rustPlatform, darwin, openssl, libsodium, pkgconfig }:

with rustPlatform;

buildRustPackage rec {
name = "pijul-${version}";
version = "0.8.0";
version = "0.10.0";

src = fetchurl {
url = "https://pijul.org/releases/${name}.tar.gz";
sha256 = "00pi03yp2bgnjpsz2hgaapxfw2i4idbjqc88cagpvn4yr1612wqx";
sha256 = "1lkipcp83rfsj9yqddvb46dmqdf2ch9njwvjv8f3g91rmfjcngys";
};

sourceRoot = "${name}/pijul";
cargoPatches = [
./libpijul.patch
];

buildInputs = stdenv.lib.optionals stdenv.isDarwin
nativeBuildInputs = [ pkgconfig ];

postInstall = ''
mkdir -p $out/share/{bash-completion/completions,zsh/site-functions,fish/vendor_completions.d}
$out/bin/pijul generate-completions --bash > $out/share/bash-completion/completions/pijul
$out/bin/pijul generate-completions --zsh > $out/share/zsh/site-functions/_pijul
$out/bin/pijul generate-completions --fish > $out/share/fish/vendor_completions.d/pijul.fish
'';

buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin
(with darwin.apple_sdk.frameworks; [ Security ]);

doCheck = false;

cargoSha256 = "1cnr08qbpia3336l37k1jli20d7kwnrw2gys8s9mg271cb4vdx03";
cargoSha256 = "1419mlxa4p53hm5qzfd1yi2k0n1bcv8kaslls1nyx661vknhfamw";

meta = with stdenv.lib; {
description = "A distributed version control system";
61 changes: 61 additions & 0 deletions pkgs/applications/version-management/pijul/libpijul.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
--- 2/pijul-0.10.0/Cargo.lock 1970-01-01 01:00:00.000000000 +0100
+++ pijul-0.10.0/Cargo.lock 2018-10-28 10:09:48.557639255 +0000
@@ -552,7 +552,7 @@

[[package]]
name = "libpijul"
-version = "0.10.0"
+version = "0.10.1"
dependencies = [
"base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -577,9 +577,29 @@

[[package]]
name = "libpijul"
-version = "0.10.0"
+version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-replace = "libpijul 0.10.0"
+dependencies = [
+ "base64 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bs58 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl 0.10.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sanakirja 0.8.16 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thrussh-keys 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]

[[package]]
name = "line"
@@ -917,7 +937,7 @@
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"ignore 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"isatty 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
"line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pager 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1796,7 +1816,7 @@
"checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
"checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
"checksum libflate 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1a429b86418868c7ea91ee50e9170683f47fd9d94f5375438ec86ec3adb74e8e"
-"checksum libpijul 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80fd579ba6762eac3f12c9624d5496edaba5a2f2e8785bcf8310372328e06ebe"
+"checksum libpijul 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cf6fc1aa0e9402f8283bdeb2507cfb6798d2f2f973da34c3f4b0c96a456b74cd"
"checksum line 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ecdd22a3856203276b7854e16213139428e82922530438f36356e5b361ea4a42"
"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
Loading