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: a381b7899844
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: 9b3c53e0f71f
Choose a head ref
  • 5 commits
  • 6 files changed
  • 5 contributors

Commits on Jun 8, 2018

  1. jetbrainsjdk: 152b1136.20 -> 152b1248.6 

    (cherry picked from commit a0b7475)
    @Sorixelle @Mic92
    Sorixelle authored and Mic92 committed Jun 8, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    edolstra Eelco Dolstra
    GPG key ID: 8170B4726D7198DE
    Verified
    Learn about vigilant mode
    Copy the full SHA
    aab0775 View commit details

  2. Jetbrains CLion: 2018.1.2 -> 2018.1.3 

    (cherry picked from commit 5d9a182)
    @sondr3 @Mic92
    sondr3 authored and Mic92 committed Jun 8, 2018
    Copy the full SHA
    7179bad View commit details

  3. nix: 2.0.3 -> 2.0.4 

    (cherry picked from commit 47b85dc)
    @edolstra @LnL7
    edolstra authored and LnL7 committed Jun 8, 2018
    Copy the full SHA
    561585f View commit details

  4. eid-mw: 4.4.1 -> 4.4.2 (#41571) 

    Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/eid-mw/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/eid-viewer had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/.eid-viewer-wrapped had a zero exit code or showed the expected version
- /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/beid-update-nssdb passed the binary check.
- /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/eid-nssdb passed the binary check.
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 4.4.2 with grep in /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2
- directory tree listing: https://gist.github.com/9bc7e47978cdc6d1c57b60a0cdf06ffc
- du listing: https://gist.github.com/8f3d2be711226cec456c9d62c6e114d6

(cherry picked from commit a2f8e94)
    @r-ryantm @xeji
    r-ryantm authored and xeji committed Jun 8, 2018
    Copy the full SHA
    f4fdffd View commit details

  5. autoPatchelfHook: Patch PIC exes/libs as well 

    If there is a shared object or executable that's using
position-independent code, the file's mime type is
"application/x-pie-executable", so until this change its dependencies
wouldn't be patched.

This simply adds the mime type to the search loop.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit ff5cecf)
Reason: The fix is non-intrusive and should not break anything that
        wasn't broken before. I've tested whether oracle-instantclient
        builds and it still does. Other than that no other package is
        using autoPatchelfHook in NixOS 18.03.
    @aszlig
    aszlig committed Jun 8, 2018
    Copy the full SHA
    9b3c53e View commit details
8 changes: 4 additions & 4 deletions nixos/modules/installer/tools/nix-fallback-paths.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
x86_64-linux = "/nix/store/z6avpvg24f6d1br2sr6qlphsq3h4d91v-nix-2.0.2";
i686-linux = "/nix/store/cdqjyb9srhwkc4gqbknnap7y31lws4yq-nix-2.0.2";
aarch64-linux = "/nix/store/fbgaa3fb2am30klwv4lls44njwqh487a-nix-2.0.2";
x86_64-darwin = "/nix/store/hs8mxsvdhm95dxgx943d74fws01j2zj3-nix-2.0.2";
x86_64-linux = "/nix/store/0d60i73mcv8z1m8d2m74yfn84980gfsa-nix-2.0.4";
i686-linux = "/nix/store/6ssafj2s5a2g9x28yld7b70vwd6vw6lb-nix-2.0.4";
aarch64-linux = "/nix/store/3wwch7bp7n7xsl8apgy2a4b16yzyij1z-nix-2.0.4";
x86_64-darwin = "/nix/store/771l8i0mz4c8kry8cz3sz8rr3alalckg-nix-2.0.4";
}
4 changes: 2 additions & 2 deletions pkgs/applications/editors/jetbrains/default.nix
View file
Original file line number Diff line number Diff line change
@@ -239,12 +239,12 @@ in

clion = buildClion rec {
name = "clion-${version}";
version = "2018.1.2"; /* updated by script */
version = "2018.1.3";
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 = "158ydbr0bbzm1nqi4xhrcp6bwk7kmiw78v959h7bxg3y7z55hbwa"; /* updated by script */
sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5";
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
1 change: 1 addition & 0 deletions pkgs/build-support/setup-hooks/auto-patchelf.sh
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ findElfs() {
while [ -n "$1" ]; do
mimeType="$(file -b -N --mime-type "$1")"
if [ "$mimeType" = application/x-executable \
-o "$mimeType" = application/x-pie-executable \
-o "$mimeType" = application/x-sharedlib ]; then
echo "$1"
fi
4 changes: 2 additions & 2 deletions pkgs/development/compilers/jetbrains-jdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@

let drv = stdenv.mkDerivation rec {
pname = "jetbrainsjdk";
version = "152b1136.20";
version = "152b1248.6";
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 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b";
sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7";
}
else
throw "unsupported system: ${stdenv.system}";
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -132,10 +132,10 @@ in rec {
}) // { perl-bindings = nixStable; };

nixStable = (common rec {
name = "nix-2.0.2";
name = "nix-2.0.4";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435";
sha256 = "166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b";
};
}) // { perl-bindings = perl-bindings { nix = nixStable; }; };

4 changes: 2 additions & 2 deletions pkgs/tools/security/eid-mw/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@

stdenv.mkDerivation rec {
name = "eid-mw-${version}";
version = "4.4.1";
version = "4.4.2";

src = fetchFromGitHub {
sha256 = "0an7xgj5rzl75kq6qfrmm886v639hhlh7c9yfs8iihc47wghpma8";
sha256 = "0jsa1jl51kz8i8dpi3664a7y3bhypr3ipk1srzxfkk6aph4a5cdf";
rev = "v${version}";
repo = "eid-mw";
owner = "Fedict";