Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a18e77630bc6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c2d814880ab5
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on May 5, 2020

  1. wxsqlite3: 3.3.1 -> 4.5.1

    @prusnak
    prusnak committed May 5, 2020
    Copy the full SHA
    bece8c0 View commit details

  2. wxsqliteplus: get rid of sha1 + package cleanup

    @prusnak
    prusnak committed May 5, 2020
    Copy the full SHA
    271a9de View commit details

Commits on May 7, 2020

  1. Merge pull request #86969 from prusnak/wxsqlite 

    wxsqlite3: 3.3.1 -> 4.5.1
    @grahamc
    grahamc authored May 7, 2020

    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
    c2d8148 View commit details
Showing with 13 additions and 11 deletions.
  1. +10 −7 pkgs/development/libraries/wxsqlite3/default.nix
  2. +3 −4 pkgs/development/libraries/wxsqliteplus/default.nix
17 changes: 10 additions & 7 deletions pkgs/development/libraries/wxsqlite3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
{ stdenv, fetchFromGitHub, wxGTK, sqlite
, darwin }:
{ stdenv
, fetchFromGitHub
, autoreconfHook
, wxGTK
, sqlite
, darwin
}:

stdenv.mkDerivation rec {
pname = "wxsqlite3";
version = "3.3.1";
version = "4.5.1";

src = fetchFromGitHub {
owner = "utelle";
repo = "wxsqlite3";
rev = "v${version}";
sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g";
sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3";
};

preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
cp build28/Info.plist.in build28/wxmac.icns build/
'';
nativeBuildInputs = [ autoreconfHook ];

buildInputs = [ wxGTK sqlite ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];
7 changes: 3 additions & 4 deletions pkgs/development/libraries/wxsqliteplus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "guanlisheng";
repo = "wxsqliteplus";
rev = "v${version}";
sha1 = "yr9ysviv4hbrxn900z1wz8j32frimvx1";
sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf";
};

buildInputs = [ wxGTK wxsqlite3 sqlite ];
@@ -24,12 +24,11 @@ stdenv.mkDerivation rec {
'';

installPhase = ''
mkdir -p $out/bin
cp wxsqliteplus $out/bin/
install -D wxsqliteplus $out/bin/wxsqliteplus
'';

meta = with stdenv.lib; {
homepage = "http://guanlisheng.com/";
homepage = "https://github.com/guanlisheng/wxsqliteplus";
description = "A simple SQLite database browser built with wxWidgets";
platforms = platforms.unix;
maintainers = with maintainers; [ vrthra ];