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: 97a2621dae7c
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: 032a3286fd88
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 20, 2018

  1. masterpdfeditor: 4.3.61 -> 4.3.82 

    (cherry picked from commit 77b205b)
    @jfrankenau @Mic92
    jfrankenau authored and Mic92 committed Mar 20, 2018
    Copy the full SHA
    9cd1122 View commit details

  2. sqldeveloper: 17.4.0.355.2349 -> 17.4.1.054.0712 

    (cherry picked from commit f9dda86)
    @flokli @Mic92
    flokli authored and Mic92 committed Mar 20, 2018
    Copy the full SHA
    032a328 View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/applications/misc/masterpdfeditor/default.nix
  2. +2 −2 pkgs/development/tools/database/sqldeveloper/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/misc/masterpdfeditor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
let
version = "4.3.61";
version = "4.3.82";
in
stdenv.mkDerivation {
name = "masterpdfeditor-${version}";
src = fetchurl {
url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm";
sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4";
};
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc
4 changes: 2 additions & 2 deletions pkgs/development/tools/database/sqldeveloper/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, makeWrapper, requireFile, unzip, openjdk }:

stdenv.mkDerivation rec {
version = "17.4.0.355.2349";
version = "17.4.1.054.0712";
name = "sqldeveloper-${version}";

src = requireFile rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
nix-prefetch-url --type sha256 file:///path/to/${name}
'';
# obtained by `sha256sum sqldeveloper-${version}-no-jre.zip`
sha256 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850";
sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a";
};

buildInputs = [ makeWrapper unzip ];