diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-01 11:45:46 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-01 11:45:46 +0200 |
| commit | f13778392713bca1aca3b9252c727cf0556d6b2b (patch) | |
| tree | 672fbd6677d82aa18e614a2d90248a392917f6d1 /pkgs/applications/editors | |
| parent | 622f822254bdf439c44891d4919bcfb760b9514a (diff) | |
| parent | a381d42221b9fcd171fd892c75b6ea83eda36adb (diff) | |
| download | nixpkgs-f13778392713bca1aca3b9252c727cf0556d6b2b.tar nixpkgs-f13778392713bca1aca3b9252c727cf0556d6b2b.tar.gz nixpkgs-f13778392713bca1aca3b9252c727cf0556d6b2b.tar.bz2 nixpkgs-f13778392713bca1aca3b9252c727cf0556d6b2b.tar.lz nixpkgs-f13778392713bca1aca3b9252c727cf0556d6b2b.tar.xz nixpkgs-f13778392713bca1aca3b9252c727cf0556d6b2b.tar.zst nixpkgs-f13778392713bca1aca3b9252c727cf0556d6b2b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/atom/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/editors/geany/default.nix | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 63b322b06ab..bc791d63d24 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -3,8 +3,8 @@ let versions = { atom = { - version = "1.36.0"; - sha256 = "1ljg39h5xjigk2njvxyinb1gd3sbja21v47c7va6vl9hjr5xb3fr"; + version = "1.36.1"; + sha256 = "1m7q2r3zx463k7kpqb364piqrr69wrhs033ibzxdx9y7r4204qp4"; }; atom-beta = { diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 219d5fca86c..4eb988a782c 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -75,7 +75,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - configureFlags = [ "--with-modules" ] ++ + configureFlags = [ + "--disable-build-details" # for a (more) reproducible build + "--with-modules" + ] ++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns")) ++ (if withNS diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index 9f33bd08489..0ff56e9145f 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.34.1"; + version = "1.35"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.geany.org/${name}.tar.bz2"; - sha256 = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11"; + sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; |