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: 19332e4d527e
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: 0b458a412997
Choose a head ref
  • 6 commits
  • 8 files changed
  • 5 contributors

Commits on Jun 4, 2018

  1. julia: add some version info to passthru, will be used by julia2nix

    @rbvermaa
    rbvermaa committed Jun 4, 2018
    Copy the full SHA
    c548814 View commit details

  2. linux-copperhead: 4.16.12.a -> 4.16.13.a

    @NeQuissimus
    NeQuissimus committed Jun 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c4a404 View commit details

  3. gnome3.vinagre: fix build 

    Currently, vinagre fails to build with the following message:

vinagre/vinagre-utils.c: In function 'vinagre_utils_request_credential':
vinagre/vinagre-utils.c:686:2: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
  _tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
  ^~~~~~~

vinagre-utils.c seems to be generated from vinagre-utils.vala. I
couldn't find anything weird in here, so let's disable
-Werror=format-nonliteral for now as done elsewhere, too.
    @flokli
    flokli committed Jun 4, 2018
    Copy the full SHA
    67eaab8 View commit details

  4. linux: Add 4.17

    @NeQuissimus
    NeQuissimus committed Jun 4, 2018
    Copy the full SHA
    3944456 View commit details

  5. vinagre: disable format hardening 

    https://hydra.nixos.org/build/75464534/nixlog/1
    @matthewbauer
    matthewbauer authored Jun 4, 2018
    Copy the full SHA
    f34b498 View commit details

  6. Merge pull request #41449 from flokli/vinagre-build 

    gnome3.vinagre: fix build
    @LnL7
    LnL7 authored Jun 4, 2018
    Copy the full SHA
    0b458a4 View commit details
4 changes: 4 additions & 0 deletions pkgs/desktops/gnome-3/apps/vinagre/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,11 +18,15 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret
itstool makeWrapper gnome3.defaultIconTheme librsvg ];

NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";

preFixup = ''
wrapProgram "$out/bin/vinagre" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
'';

hardeningDisable = [ "format" ];

meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Vinagre;
description = "Remote desktop viewer for GNOME";
12 changes: 11 additions & 1 deletion pkgs/development/compilers/julia/0.6.nix
View file
Original file line number Diff line number Diff line change
@@ -50,11 +50,16 @@ let
url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
};

majorVersion = "0";
minorVersion = "6";
maintenanceVersion = "2";
version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
in

stdenv.mkDerivation rec {
pname = "julia";
version = "0.6.2";
inherit version;
name = "${pname}-${version}";

src = fetchzip {
@@ -183,6 +188,11 @@ stdenv.mkDerivation rec {
done
'';

passthru = {
inherit majorVersion minorVersion maintenanceVersion;
site = "share/julia/site/v${majorVersion}.${minorVersion}";
};

meta = {
description = "High-level performance-oriented dynamical language for technical computing";
homepage = https://julialang.org/;
Loading