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: 56ddb0a32acb
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: fb1c7bf633dc
Choose a head ref
  • 6 commits
  • 3 files changed
  • 3 contributors

Commits on May 23, 2020

  1. terraria-server: 1.4.0.3 -> 1.4.0.4

    @samhza
    samhza committed May 23, 2020
    Copy the full SHA
    1bd0eec View commit details

  2. sherpa: 2.2.9 -> 2.2.10

    @veprbl
    veprbl committed May 23, 2020
    Copy the full SHA
    e6282f9 View commit details

  3. libsForQt5.qscintilla: fix darwin build

    @veprbl
    veprbl committed May 23, 2020
    Copy the full SHA
    04fd664 View commit details

Commits on May 24, 2020

  1. Merge pull request #88728 from veprbl/pr/qscintilla_darwin_fix 

    libsForQt5.qscintilla: fix darwin build
    @veprbl
    veprbl authored May 24, 2020
    Copy the full SHA
    f64dddb View commit details

  2. Merge pull request #88713 from veprbl/pr/sherpa_2_2_10 

    sherpa: 2.2.9 -> 2.2.10
    @veprbl
    veprbl authored May 24, 2020
    Copy the full SHA
    9eb3f39 View commit details

  3. Merge pull request #88706 from erebid/update-terraria 

    terraria-server: 1.4.0.3 -> 1.4.0.4
    @bhipple
    bhipple authored May 24, 2020
    Copy the full SHA
    fb1c7bf View commit details
Showing with 6 additions and 13 deletions.
  1. +2 −2 pkgs/applications/science/physics/sherpa/default.nix
  2. +1 −8 pkgs/development/libraries/qscintilla/default.nix
  3. +3 −3 pkgs/games/terraria-server/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/science/physics/sherpa/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "sherpa";
version = "2.2.9";
version = "2.2.10";

src = fetchurl {
url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
sha256 = "1z7vws97k6zfzyqx0dkv2kq8d83dibi73i5jiqk5a22yplp6bnjh";
sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4";
};

buildInputs = [ gfortran sqlite lhapdf rivet ];
9 changes: 1 addition & 8 deletions pkgs/development/libraries/qscintilla/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,12 +5,6 @@
}:

let
# Fix Xcode 8 compilation problem
xcodePatch = fetchurl {
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch";
sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9";
};

pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
version = "2.11.2";

@@ -32,8 +26,7 @@ in stdenv.mkDerivation rec {
++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;

patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++
(lib.optional (!withQt5) ./fix-qt4-build.patch );
patches = lib.optional (!withQt5) ./fix-qt4-build.patch;

# Make sure that libqscintilla2.so is available in $out/lib since it is expected
# by some packages such as sqlitebrowser
6 changes: 3 additions & 3 deletions pkgs/games/terraria-server/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@

stdenv.mkDerivation rec {
pname = "terraria-server";
version = "1.4.0.3";
version = "1.4.0.4";
urlVersion = lib.replaceChars [ "." ] [ "" ] version;

src = fetchurl {
url = "https://terraria.org/system/dedicated_servers/archives/000/000/037/original/terraria-server-${urlVersion}.zip";
sha256 = "1g9rd0a40gsljk8xp3bkvwy8ngywjzk8chf2x9l43s2kf40ib0p8";
url = "https://terraria.org/system/dedicated_servers/archives/000/000/038/original/terraria-server-${urlVersion}.zip";
sha256 = "09zkadjd04gbx1yvwpqmm89viydwxqgixbqhbqncb94qb2z5gfxk";
};

buildInputs = [ file unzip ];