Skip to content

Commit edeb077

Browse files
committed
Add nix
1 parent 3ce0778 commit edeb077

File tree

4 files changed

+26
-10
lines changed

4 files changed

+26
-10
lines changed

.github/workflows/nix.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: nix build
2+
3+
on:
4+
pull_request:
5+
branches: [ "*" ]
6+
7+
jobs:
8+
tests:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: cachix/install-nix-action@v25
13+
with:
14+
nix_path: nixpkgs=channel:nixos-unstable
15+
- uses: cachix/cachix-action@v14
16+
with:
17+
name: msoos
18+
# If you chose API tokens for write access OR if you have a private cache
19+
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
20+
- run: nix build

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,6 @@ if (NOT WIN32)
235235
#add_cxx_flag_if_supported("-fvisibility=hidden")
236236
endif()
237237
add_compile_options("-fPIC")
238-
add_cxx_flag_if_supported("-mtune=native")
239-
240238
if(CMAKE_BUILD_TYPE STREQUAL "Release")
241239
#NOTE: out-satrace19-8373595 has confirmed that O3+flto only hurts compared to O2
242240
# on gcc version 7.3.0

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
description = "An fast, almost-uniform CNF sampler";
2+
description = "A heuristic CNF sampler built on CryptoMiniSat";
33
inputs = {
44
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
55
};
@@ -21,7 +21,6 @@
2121
fetchFromGitHub,
2222
cmake,
2323
pkg-config,
24-
gmp,
2524
zlib,
2625
}:
2726
stdenv.mkDerivation {
@@ -32,6 +31,7 @@
3231
./src
3332
./CMakeLists.txt
3433
./cmake
34+
./scripts
3535
./cmsgenConfig.cmake.in
3636
];
3737
};
@@ -41,7 +41,6 @@
4141
pkg-config
4242
];
4343
buildInputs = [
44-
gmp
4544
zlib
4645
];
4746
};
@@ -50,8 +49,7 @@
5049
packages = forAllSystems (
5150
system:
5251
let
53-
cmsgen = nixpkgsFor.${system}.callPackage cmsgen-package {
54-
};
52+
cmsgen = nixpkgsFor.${system}.callPackage cmsgen-package { };
5553
in
5654
{
5755
inherit cmsgen;

0 commit comments

Comments
 (0)